Download as
Browse Code »

Commit ba869eb36522034b60d819fb4d83bd0b0a751033

Authored by Braulio Bhavamitra
Committed by Daniela Feitosa
1 parent c5ec52ba
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix cucumber installation and tests 

Now cucumber gems should install fine with RAILS_ENV=cucumber
gems:install in Debian Lenny and its task start/stop solr
Showing 6 changed files with 22 additions and 16 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @ba869eb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # application. 2 # application.
3 module ApplicationHelper 3 module ApplicationHelper
4 4
5 - include PermissionName 5 + include PermissionNameHelper
6 6
7 include LightboxHelper 7 include LightboxHelper
8 8
config/environments/cucumber.rb
  Diff comments   View file @ba869eb
@@ -21,9 +21,8 @@ config.action_mailer.delivery_method = :test @@ -21,9 +21,8 @@ config.action_mailer.delivery_method = :test
21 21
22 config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) 22 config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
23 config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) 23 config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
24 -config.gem 'rspec', :lib => 'spec', :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))  
25 -config.gem 'rspec-rails', :lib => 'spec/rails', :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))  
26 -config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))  
27 -config.gem 'selenium-client', :lib => 'selenium/client', :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client')) 24 +config.gem 'rspec', :lib => 'spec', :version => '=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
  25 +config.gem 'rspec-rails', :lib => 'spec/rails', :version => '1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
  26 +config.gem 'Selenium', :lib => 'selenium', :version => '1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
  27 +config.gem 'selenium-client', :lib => 'selenium/client', :version => '1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
28 config.gem 'database_cleaner', :lib => 'database_cleaner' 28 config.gem 'database_cleaner', :lib => 'database_cleaner'
29 -  
config/solr.yml.dist
  Diff comments   View file @ba869eb
@@ -3,15 +3,18 @@ @@ -3,15 +3,18 @@
3 # If you change the host or port number here, make sure you update 3 # If you change the host or port number here, make sure you update
4 # them in your Solr config file 4 # them in your Solr config file
5 5
6 -development:  
7 - url: http://0.0.0.0:8982/solr  
8 - jvm_options: -server -Xmx64M -Xms16M  
9 -  
10 production: 6 production:
11 url: http://127.0.0.1:8983/solr 7 url: http://127.0.0.1:8983/solr
12 jvm_options: -server -Xmx512M -Xms64M 8 jvm_options: -server -Xmx512M -Xms64M
13 9
  10 +development:
  11 + url: http://0.0.0.0:8982/solr
  12 + jvm_options: -server -Xmx64M -Xms16M
  13 +
14 test: 14 test:
15 url: http://0.0.0.0:8981/solr 15 url: http://0.0.0.0:8981/solr
16 jvm_options: -server -Xmx32M -Xms16M 16 jvm_options: -server -Xmx32M -Xms16M
17 17
  18 +cucumber:
  19 + url: http://0.0.0.0:8980/solr
  20 + jvm_options: -server -Xmx32M -Xms16M
lib/tasks/cucumber.rake
  Diff comments   View file @ba869eb
@@ -11,9 +11,11 @@ begin @@ -11,9 +11,11 @@ begin
11 vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first 11 vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
12 12
13 namespace :cucumber do 13 namespace :cucumber do
14 - Cucumber::Rake::Task.new({:solr_start => 'solr:start'}, 'Run solr before') do |t| 14 + task :solr_start do
  15 + ENV['RAILS_ENV'] = 'cucumber'
  16 + Rake::Task['solr:stop'].invoke
  17 + Rake::Task['solr:download'].invoke
15 Rake::Task['solr:start'].invoke 18 Rake::Task['solr:start'].invoke
16 -# ENV['RAILS_ENV'] = 'cucumber'  
17 end 19 end
18 20
19 Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| 21 Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
@@ -34,7 +36,9 @@ begin @@ -34,7 +36,9 @@ begin
34 t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" 36 t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
35 end 37 end
36 38
37 - Cucumber::Rake::Task.new({:solr_stop => 'solr:stop'}, 'Run solr after') do |t| 39 + task :solr_stop do
  40 + ENV['RAILS_ENV'] = 'cucumber'
  41 + Rake::Task['solr:stop'].invoke
38 end 42 end
39 43
40 desc 'Run all features' 44 desc 'Run all features'
@@ -42,7 +46,7 @@ begin @@ -42,7 +46,7 @@ begin
42 end 46 end
43 end 47 end
44 desc 'Alias for cucumber:ok' 48 desc 'Alias for cucumber:ok'
45 - task :cucumber => 'cucumber:ok' 49 + task :cucumber => ['cucumber:solr_start', 'cucumber:ok', 'cucumber:solr_stop']
46 50
47 task :features => :cucumber do 51 task :features => :cucumber do
48 STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" 52 STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
vendor/plugins/access_control/init.rb
  Diff comments   View file @ba869eb
@@ -2,5 +2,5 @@ require 'acts_as_accessor' @@ -2,5 +2,5 @@ require 'acts_as_accessor'
2 require 'acts_as_accessible' 2 require 'acts_as_accessible'
3 require 'permission_name_helper' 3 require 'permission_name_helper'
4 module ApplicationHelper 4 module ApplicationHelper
5 - include PermissionName 5 + include PermissionNameHelper
6 end 6 end
vendor/plugins/access_control/lib/permission_name_helper.rb
  Diff comments   View file @ba869eb
1 -module PermissionName 1 +module PermissionNameHelper
2 def permission_name(p) 2 def permission_name(p)
3 msgid = ActiveRecord::Base::PERMISSIONS.values.inject({}){|s,v| s.merge(v)}[p] 3 msgid = ActiveRecord::Base::PERMISSIONS.values.inject({}){|s,v| s.merge(v)}[p]
4 gettext(msgid) 4 gettext(msgid)