From ba869eb36522034b60d819fb4d83bd0b0a751033 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Thu, 11 Aug 2011 03:18:32 +0000 Subject: [PATCH] Fix cucumber installation and tests --- app/helpers/application_helper.rb | 2 +- config/environments/cucumber.rb | 9 ++++----- config/solr.yml.dist | 11 +++++++---- lib/tasks/cucumber.rake | 12 ++++++++---- vendor/plugins/access_control/init.rb | 2 +- vendor/plugins/access_control/lib/permission_name_helper.rb | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b7b8cbd..95e8898 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,7 +2,7 @@ # application. module ApplicationHelper - include PermissionName + include PermissionNameHelper include LightboxHelper diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb index cc00783..fcc958f 100644 --- a/config/environments/cucumber.rb +++ b/config/environments/cucumber.rb @@ -21,9 +21,8 @@ config.action_mailer.delivery_method = :test config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) -config.gem 'rspec', :lib => 'spec', :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) -config.gem 'rspec-rails', :lib => 'spec/rails', :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) -config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium')) -config.gem 'selenium-client', :lib => 'selenium/client', :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client')) +config.gem 'rspec', :lib => 'spec', :version => '=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) +config.gem 'rspec-rails', :lib => 'spec/rails', :version => '1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) +config.gem 'Selenium', :lib => 'selenium', :version => '1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium')) +config.gem 'selenium-client', :lib => 'selenium/client', :version => '1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client')) config.gem 'database_cleaner', :lib => 'database_cleaner' - diff --git a/config/solr.yml.dist b/config/solr.yml.dist index 811de24..c7577e6 100644 --- a/config/solr.yml.dist +++ b/config/solr.yml.dist @@ -3,15 +3,18 @@ # If you change the host or port number here, make sure you update # them in your Solr config file -development: - url: http://0.0.0.0:8982/solr - jvm_options: -server -Xmx64M -Xms16M - production: url: http://127.0.0.1:8983/solr jvm_options: -server -Xmx512M -Xms64M +development: + url: http://0.0.0.0:8982/solr + jvm_options: -server -Xmx64M -Xms16M + test: url: http://0.0.0.0:8981/solr jvm_options: -server -Xmx32M -Xms16M +cucumber: + url: http://0.0.0.0:8980/solr + jvm_options: -server -Xmx32M -Xms16M diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake index 6df754e..9b0c52e 100644 --- a/lib/tasks/cucumber.rake +++ b/lib/tasks/cucumber.rake @@ -11,9 +11,11 @@ begin vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first namespace :cucumber do - Cucumber::Rake::Task.new({:solr_start => 'solr:start'}, 'Run solr before') do |t| + task :solr_start do + ENV['RAILS_ENV'] = 'cucumber' + Rake::Task['solr:stop'].invoke + Rake::Task['solr:download'].invoke Rake::Task['solr:start'].invoke -# ENV['RAILS_ENV'] = 'cucumber' end Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| @@ -34,7 +36,9 @@ begin t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" end - Cucumber::Rake::Task.new({:solr_stop => 'solr:stop'}, 'Run solr after') do |t| + task :solr_stop do + ENV['RAILS_ENV'] = 'cucumber' + Rake::Task['solr:stop'].invoke end desc 'Run all features' @@ -42,7 +46,7 @@ begin end end desc 'Alias for cucumber:ok' - task :cucumber => 'cucumber:ok' + task :cucumber => ['cucumber:solr_start', 'cucumber:ok', 'cucumber:solr_stop'] task :features => :cucumber do STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" diff --git a/vendor/plugins/access_control/init.rb b/vendor/plugins/access_control/init.rb index d3e6ddc..3ce5421 100644 --- a/vendor/plugins/access_control/init.rb +++ b/vendor/plugins/access_control/init.rb @@ -2,5 +2,5 @@ require 'acts_as_accessor' require 'acts_as_accessible' require 'permission_name_helper' module ApplicationHelper - include PermissionName + include PermissionNameHelper end diff --git a/vendor/plugins/access_control/lib/permission_name_helper.rb b/vendor/plugins/access_control/lib/permission_name_helper.rb index b67f02e..1e9a52d 100644 --- a/vendor/plugins/access_control/lib/permission_name_helper.rb +++ b/vendor/plugins/access_control/lib/permission_name_helper.rb @@ -1,4 +1,4 @@ -module PermissionName +module PermissionNameHelper def permission_name(p) msgid = ActiveRecord::Base::PERMISSIONS.values.inject({}){|s,v| s.merge(v)}[p] gettext(msgid) -- libgit2 0.21.2