Download as
Browse Code »

Commit a56214cff8c7dd6f24a3fab030fabc4ece707ca1

Authored by Daniela Feitosa
1 parent 7338101a
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Revert "Fix cucumber installation and tests" 

This reverts commit ba869eb36522034b60d819fb4d83bd0b0a751033.

Conflicts:

	config/solr.yml.dist
	lib/tasks/cucumber.rake

There are some problems with solr
(ActionItem1958)
Showing 2 changed files with 21 additions and 4 deletions   Show diff stats
config/environments/cucumber.rb
  Diff comments   View file @a56214c
@@ -21,9 +21,9 @@ config.action_mailer.delivery_method = :test @@ -21,9 +21,9 @@ 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 29
config/solr.yml.dist 0 → 100644
  Diff comments   View file @a56214c
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +# Config file for the acts_as_solr plugin.
  2 +#
  3 +# If you change the host or port number here, make sure you update
  4 +# them in your Solr config file
  5 +
  6 +development:
  7 + url: http://0.0.0.0:8982/solr
  8 + jvm_options: -server -Xmx64M -Xms16M
  9 +
  10 +production:
  11 + url: http://127.0.0.1:8983/solr
  12 + jvm_options: -server -Xmx512M -Xms64M
  13 +
  14 +test:
  15 + url: http://0.0.0.0:8981/solr
  16 + jvm_options: -server -Xmx32M -Xms16M
  17 +