Download as
Browse Code »

Commit ad86437866380c247111431c0bc3bb8a8a3223cc

Authored by Rodrigo Souto
1 parent d77120be
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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