Download as
Browse Code »

Commit 0f829cb75b45aa4468728918799474341e603ac3

Authored by Rafael Martins
1 parent c6f24fe8
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Fix for cucumber environment gems spec (wrongly merged)

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
config/environments/cucumber.rb
  Diff comments   View file @0f829cb
@@ -18,8 +18,6 @@ config.action_controller.allow_forgery_protection = false @@ -18,8 +18,6 @@ config.action_controller.allow_forgery_protection = false
18 # The :test delivery method accumulates sent emails in the 18 # The :test delivery method accumulates sent emails in the
19 # ActionMailer::Base.deliveries array. 19 # ActionMailer::Base.deliveries array.
20 config.action_mailer.delivery_method = :test 20 config.action_mailer.delivery_method = :test
21 -<<<<<<< HEAD  
22 -=======  
23 21
24 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'))
25 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'))
@@ -28,4 +26,3 @@ config.gem &#39;rspec-rails&#39;, :lib =&gt; &#39;spec/rails&#39;, :version =&gt; &#39;1.2.9&#39; unles @@ -28,4 +26,3 @@ config.gem &#39;rspec-rails&#39;, :lib =&gt; &#39;spec/rails&#39;, :version =&gt; &#39;1.2.9&#39; unles
28 config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium')) 26 config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
29 config.gem 'selenium-client', :lib => 'selenium/client', :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client')) 27 config.gem 'selenium-client', :lib => 'selenium/client', :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
30 config.gem 'database_cleaner', :lib => 'database_cleaner' 28 config.gem 'database_cleaner', :lib => 'database_cleaner'
31 ->>>>>>> noosfero-bsc/solr-merge