Download as
Browse Code »

Commit e372474dd84697258518f38656029c8982d30e08

Authored by Antonio Terceiro
1 parent 359f5d1c
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Restore behavior of the `default` rake task 

When you load rspec in the Gemfile, it will override the default task
and try to run specs from spec/ (which don't exist in noosfero) instead
of the tests from test/.
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
@@ -54,8 +54,8 @@ group :development, :test do @@ -54,8 +54,8 @@ group :development, :test do
54 end 54 end
55 55
56 group :test do 56 group :test do
57 - gem 'rspec', '~> 3.3'  
58 - gem 'rspec-rails', '~> 3.2' 57 + gem 'rspec', '~> 3.3', require: false
  58 + gem 'rspec-rails', '~> 3.2', require: false
59 gem 'mocha', '~> 1.1.0', :require => false 59 gem 'mocha', '~> 1.1.0', :require => false
60 gem 'test-unit' if RUBY_VERSION >= '2.2.0' 60 gem 'test-unit' if RUBY_VERSION >= '2.2.0'
61 gem 'minitest' 61 gem 'minitest'