From 688b3512fb7f64e2b400874dd7b6f935e2c84b0c Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 10 Oct 2013 21:21:42 -0300 Subject: [PATCH] environment_features: passing false on enable/disable in cases where should not save the environment --- test/unit/application_helper_test.rb | 2 +- test/unit/environment_statistics_block_test.rb | 2 +- test/unit/environment_test.rb | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index e96507e..4a493da 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -592,7 +592,7 @@ class ApplicationHelperTest < ActiveSupport::TestCase should 'include item in usermenu for environment enabled features' do env = Environment.new - env.enable('xmpp_chat') + env.enable('xmpp_chat', false) stubs(:environment).returns(env) @controller = ApplicationController.new diff --git a/test/unit/environment_statistics_block_test.rb b/test/unit/environment_statistics_block_test.rb index 1a58733..fe4fd9d 100644 --- a/test/unit/environment_statistics_block_test.rb +++ b/test/unit/environment_statistics_block_test.rb @@ -85,7 +85,7 @@ class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase should 'not display enterprises if disabled' do env = Environment.new - env.enable('disable_asset_enterprises') + env.enable('disable_asset_enterprises', false) block = EnvironmentStatisticsBlock.new block.stubs(:owner).returns(env) diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb index 1c510f4..c36de50 100644 --- a/test/unit/environment_test.rb +++ b/test/unit/environment_test.rb @@ -35,21 +35,21 @@ class EnvironmentTest < ActiveSupport::TestCase def test_features v = Environment.new - v.enable('feature1') + v.enable('feature1', false) assert v.enabled?('feature1') - v.disable('feature1') + v.disable('feature1', false) assert !v.enabled?('feature1') end def test_enabled_features v = Environment.new - v.enabled_features = [ 'feature1', 'feature2' ] + v.enable('feature1', false) + v.enable('feature2', false) assert v.enabled?('feature1') && v.enabled?('feature2') && !v.enabled?('feature3') end def test_enabled_features_no_features_enabled v = Environment.new - v.enabled_features = nil assert !v.enabled?('feature1') && !v.enabled?('feature2') && !v.enabled?('feature3') end @@ -1075,9 +1075,9 @@ class EnvironmentTest < ActiveSupport::TestCase should 'get enabled features' do env = Environment.new - env.enable('feature1') - env.enable('feature2') - env.disable('feature3') + env.enable('feature1', false) + env.enable('feature2', false) + env.disable('feature3', false) assert_includes env.enabled_features.keys, 'feature1' assert_includes env.enabled_features.keys, 'feature2' -- libgit2 0.21.2