diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb index d3f4836..cc00783 100644 --- a/config/environments/cucumber.rb +++ b/config/environments/cucumber.rb @@ -21,9 +21,9 @@ 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 new file mode 100644 index 0000000..811de24 --- /dev/null +++ b/config/solr.yml.dist @@ -0,0 +1,17 @@ +# Config file for the acts_as_solr plugin. +# +# 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 + +test: + url: http://0.0.0.0:8981/solr + jvm_options: -server -Xmx32M -Xms16M + -- libgit2 0.21.2