Download as
Browse Code »

Commit 64a617d5a263078ec597fc2e7c7534af39ad7b02

Authored by Antonio Terceiro
1 parent f9d14ef0
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

Making `rake gems:install` actually work 

This will install the needed gems in the working versions.
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
config/environment.rb
  Diff comments   View file @64a617d
@@ -56,7 +56,7 @@ Rails::Initializer.run do |config| @@ -56,7 +56,7 @@ Rails::Initializer.run do |config|
56 # config.active_record.observers = :cacher, :garbage_collector 56 # config.active_record.observers = :cacher, :garbage_collector
57 57
58 # don't load the sweepers while loading the database 58 # don't load the sweepers while loading the database
59 - unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load' 59 + unless $PROGRAM_NAME =~ /rake$/ && (ARGV.first == 'db:schema:load' || ARGV.first == 'gems:install')
60 config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper 60 config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper
61 end 61 end
62 # Make Active Record use UTC-base instead of local time 62 # Make Active Record use UTC-base instead of local time
config/environments/cucumber.rb
  Diff comments   View file @64a617d
@@ -19,8 +19,8 @@ config.action_controller.allow_forgery_protection = false @@ -19,8 +19,8 @@ config.action_controller.allow_forgery_protection = false
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 21
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.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) 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'))
24 config.gem 'rspec', :lib => 'spec', :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) 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')) 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')) 26 config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))