Download as
Browse Code »

Commit 688b3512fb7f64e2b400874dd7b6f935e2c84b0c

Authored by Rodrigo Souto
1 parent fca8659a
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_features: passing false on enable/disable in cases where should not save the environment

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