Download as
Browse Code »

Commit ad86437866380c247111431c0bc3bb8a8a3223cc

Authored by Rodrigo Souto
1 parent d77120be
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

environment_tests: fix tests due to new enable feature save as default behaviour

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
test/unit/application_helper_test.rb
  Diff comments   View file @ad86437
@@ -591,7 +591,7 @@ class ApplicationHelperTest < ActiveSupport::TestCase @@ -591,7 +591,7 @@ class ApplicationHelperTest < ActiveSupport::TestCase
591 end 591 end
592 592
593 should 'include item in usermenu for environment enabled features' do 593 should 'include item in usermenu for environment enabled features' do
594 - env = Environment.new 594 + env = fast_create(Environment)
595 env.enable('xmpp_chat') 595 env.enable('xmpp_chat')
596 stubs(:environment).returns(env) 596 stubs(:environment).returns(env)
597 597
test/unit/environment_statistics_block_test.rb
  Diff comments   View file @ad86437
@@ -84,7 +84,7 @@ class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase @@ -84,7 +84,7 @@ class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase
84 end 84 end
85 85
86 should 'not display enterprises if disabled' do 86 should 'not display enterprises if disabled' do
87 - env = Environment.new 87 + env = fast_create(Environment)
88 env.enable('disable_asset_enterprises') 88 env.enable('disable_asset_enterprises')
89 89
90 block = EnvironmentStatisticsBlock.new 90 block = EnvironmentStatisticsBlock.new
test/unit/environment_test.rb
  Diff comments   View file @ad86437
@@ -34,7 +34,7 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -34,7 +34,7 @@ class EnvironmentTest < ActiveSupport::TestCase
34 end 34 end
35 35
36 def test_features 36 def test_features
37 - v = Environment.new 37 + v = fast_create(Environment)
38 v.enable('feature1') 38 v.enable('feature1')
39 assert v.enabled?('feature1') 39 assert v.enabled?('feature1')
40 v.disable('feature1') 40 v.disable('feature1')
@@ -42,13 +42,13 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -42,13 +42,13 @@ class EnvironmentTest < ActiveSupport::TestCase
42 end 42 end
43 43
44 def test_enabled_features 44 def test_enabled_features
45 - v = Environment.new 45 + v = fast_create(Environment)
46 v.enabled_features = [ 'feature1', 'feature2' ] 46 v.enabled_features = [ 'feature1', 'feature2' ]
47 assert v.enabled?('feature1') && v.enabled?('feature2') && !v.enabled?('feature3') 47 assert v.enabled?('feature1') && v.enabled?('feature2') && !v.enabled?('feature3')
48 end 48 end
49 49
50 def test_enabled_features_no_features_enabled 50 def test_enabled_features_no_features_enabled
51 - v = Environment.new 51 + v = fast_create(Environment)
52 v.enabled_features = nil 52 v.enabled_features = nil
53 assert !v.enabled?('feature1') && !v.enabled?('feature2') && !v.enabled?('feature3') 53 assert !v.enabled?('feature1') && !v.enabled?('feature2') && !v.enabled?('feature3')
54 end 54 end
@@ -1074,7 +1074,7 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -1074,7 +1074,7 @@ class EnvironmentTest < ActiveSupport::TestCase
1074 end 1074 end
1075 1075
1076 should 'get enabled features' do 1076 should 'get enabled features' do
1077 - env = Environment.new 1077 + env = fast_create(Environment)
1078 env.enable('feature1') 1078 env.enable('feature1')
1079 env.enable('feature2') 1079 env.enable('feature2')
1080 env.disable('feature3') 1080 env.disable('feature3')