Ensure "super" is called in any test setup/teardown methods.

This ensures that any setup/teardown tasks inherited from other modules properly get called.
NREL · Jan 29, 2017 · b163093 · b163093
1 parent ed0dec1
commit b163093
Show file tree

Hide file tree

Showing 192 changed files with 192 additions and 0 deletions.
diff --git a/test/admin_ui/test_admins.rb b/test/admin_ui/test_admins.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestAdmins < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users.rb b/test/admin_ui/test_api_users.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsers < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users_allowed_ips.rb b/test/admin_ui/test_api_users_allowed_ips.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsersAllowedIps < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users_allowed_referers.rb b/test/admin_ui/test_api_users_allowed_referers.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsersAllowedReferers < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users_api_key_visibility.rb b/test/admin_ui/test_api_users_api_key_visibility.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsersApiKeyVisibility < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users_rate_limits.rb b/test/admin_ui/test_api_users_rate_limits.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsersRateLimits < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_api_users_welcome_email.rb b/test/admin_ui/test_api_users_welcome_email.rb
@@ -7,6 +7,7 @@ class Test::AdminUi::TestApiUsersWelcomeEmail < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::DelayedJob
 
   def setup
+    super
     setup_server
 
     response = Typhoeus.delete("http://127.0.0.1:13103/api/v1/messages")

diff --git a/test/admin_ui/test_api_users_xss.rb b/test/admin_ui/test_api_users_xss.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApiUsersXss < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_apis.rb b/test/admin_ui/test_apis.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApis < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
 
     Api.delete_all

diff --git a/test/admin_ui/test_apis_reordering.rb b/test/admin_ui/test_apis_reordering.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestApisReordering < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
 
     Api.delete_all

diff --git a/test/admin_ui/test_config_publish_pending.rb b/test/admin_ui/test_config_publish_pending.rb
@@ -7,6 +7,7 @@ class Test::AdminUi::TestConfigPublishPending < Minitest::Capybara::Test
   include Minitest::Hooks
 
   def setup
+    super
     setup_server
     Api.delete_all
     WebsiteBackend.delete_all

diff --git a/test/admin_ui/test_config_publish_submit.rb b/test/admin_ui/test_config_publish_submit.rb
@@ -7,6 +7,7 @@ class Test::AdminUi::TestConfigPublishSubmit < Minitest::Capybara::Test
   include Minitest::Hooks
 
   def setup
+    super
     setup_server
     Api.delete_all
     WebsiteBackend.delete_all

diff --git a/test/admin_ui/test_datatables.rb b/test/admin_ui/test_datatables.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestDatatables < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_elasticsearch_proxy.rb b/test/admin_ui/test_elasticsearch_proxy.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestElasticsearchProxy < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_legacy_redirects.rb b/test/admin_ui/test_legacy_redirects.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestLegacyRedirects < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
 
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])

diff --git a/test/admin_ui/test_locales.rb b/test/admin_ui/test_locales.rb
@@ -10,6 +10,7 @@ class Test::AdminUi::TestLocales < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_login.rb b/test/admin_ui/test_login.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestLogin < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Admin.where(:registration_source.ne => "seed").delete_all
   end

diff --git a/test/admin_ui/test_noscript.rb b/test/admin_ui/test_noscript.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestNoscript < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_page_title.rb b/test/admin_ui/test_page_title.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestPageTitle < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_roles.rb b/test/admin_ui/test_roles.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestRoles < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/admin_ui/test_stats_drilldown.rb b/test/admin_ui/test_stats_drilldown.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestStatsDrilldown < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/admin_ui/test_stats_logs.rb b/test/admin_ui/test_stats_logs.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestStatsLogs < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/admin_ui/test_stats_map.rb b/test/admin_ui/test_stats_map.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestStatsMap < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/admin_ui/test_stats_users.rb b/test/admin_ui/test_stats_users.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestStatsUsers < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/admin_ui/test_version_display.rb b/test/admin_ui/test_version_display.rb
@@ -6,6 +6,7 @@ class Test::AdminUi::TestVersionDisplay < Minitest::Capybara::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     @expected_version = File.read(File.join(API_UMBRELLA_SRC_ROOT, "src/api-umbrella/version.txt")).strip
   end

diff --git a/test/apis/admin/stats/test_logs.rb b/test/apis/admin/stats/test_logs.rb
@@ -5,6 +5,7 @@ class Test::Apis::Admin::Stats::TestLogs < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/apis/admin/stats/test_map.rb b/test/apis/admin/stats/test_map.rb
@@ -5,6 +5,7 @@ class Test::Apis::Admin::Stats::TestMap < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/apis/admin/stats/test_search.rb b/test/apis/admin/stats/test_search.rb
@@ -5,6 +5,7 @@ class Test::Apis::Admin::Stats::TestSearch < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/apis/admin/test_auth.rb b/test/apis/admin/test_auth.rb
@@ -5,6 +5,7 @@ class Test::Apis::Admin::TestAuth < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/apis/v1/admin_groups/test_admin_permissions.rb b/test/apis/v1/admin_groups/test_admin_permissions.rb
@@ -6,6 +6,7 @@ class Test::Apis::V1::AdminGroups::TestAdminPermissions < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     AdminGroup.delete_all
     ApiScope.delete_all

diff --git a/test/apis/v1/admin_groups/test_index.rb b/test/apis/v1/admin_groups/test_index.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::AdminGroups::TestIndex < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     AdminGroup.delete_all
   end

diff --git a/test/apis/v1/admin_groups/test_show.rb b/test/apis/v1/admin_groups/test_show.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::AdminGroups::TestShow < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     AdminGroup.delete_all
   end

diff --git a/test/apis/v1/admin_permissions/test_index.rb b/test/apis/v1/admin_permissions/test_index.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::AdminPermissions::TestIndex < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/apis/v1/admins/test_admin_permissions.rb b/test/apis/v1/admins/test_admin_permissions.rb
@@ -6,6 +6,7 @@ class Test::Apis::V1::Admins::TestAdminPermissions < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Admin.where(:registration_source.ne => "seed").delete_all
     AdminGroup.delete_all

diff --git a/test/apis/v1/admins/test_create.rb b/test/apis/v1/admins/test_create.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Admins::TestCreate < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Admin.where(:registration_source.ne => "seed").delete_all
   end

diff --git a/test/apis/v1/admins/test_index.rb b/test/apis/v1/admins/test_index.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Admins::TestIndex < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Admin.where(:registration_source.ne => "seed").delete_all
   end

diff --git a/test/apis/v1/analytics/test_drilldown.rb b/test/apis/v1/analytics/test_drilldown.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Analytics::TestDrilldown < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ElasticsearchHelper.clean_es_indices(["2014-11", "2015-01", "2015-03"])
   end

diff --git a/test/apis/v1/api_scopes/test_admin_permissions.rb b/test/apis/v1/api_scopes/test_admin_permissions.rb
@@ -6,6 +6,7 @@ class Test::Apis::V1::ApiScopes::TestAdminPermissions < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     ApiScope.delete_all
   end

diff --git a/test/apis/v1/apis/test_admin_permissions.rb b/test/apis/v1/apis/test_admin_permissions.rb
@@ -6,6 +6,7 @@ class Test::Apis::V1::Apis::TestAdminPermissions < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_create_sort_order.rb b/test/apis/v1/apis/test_create_sort_order.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestCreateSortOrder < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_destroy.rb b/test/apis/v1/apis/test_destroy.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestDestroy < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_index.rb b/test/apis/v1/apis/test_index.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestIndex < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_move_after.rb b/test/apis/v1/apis/test_move_after.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestMoveAfter < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_role_permissions.rb b/test/apis/v1/apis/test_role_permissions.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestRolePermissions < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_save_embedded_headers.rb b/test/apis/v1/apis/test_save_embedded_headers.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestSaveEmbeddedHeaders < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_save_embedded_presence.rb b/test/apis/v1/apis/test_save_embedded_presence.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestSaveEmbeddedPresence < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_save_embedded_yaml.rb b/test/apis/v1/apis/test_save_embedded_yaml.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestSaveEmbeddedYaml < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_save_host_validations.rb b/test/apis/v1/apis/test_save_host_validations.rb
@@ -6,6 +6,7 @@ class Test::Apis::V1::Apis::TestSaveHostValidations < Minitest::Test
   parallelize_me!
 
   def setup
+    super
     setup_server
   end
 

diff --git a/test/apis/v1/apis/test_show.rb b/test/apis/v1/apis/test_show.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestShow < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end

diff --git a/test/apis/v1/apis/test_update_custom_rate_limits.rb b/test/apis/v1/apis/test_update_custom_rate_limits.rb
@@ -5,6 +5,7 @@ class Test::Apis::V1::Apis::TestUpdateCustomRateLimits < Minitest::Test
   include ApiUmbrellaTestHelpers::Setup
 
   def setup
+    super
     setup_server
     Api.delete_all
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ class Test::AdminUi::TestAdmins < Minitest::Capybara::Test @@
       include ApiUmbrellaTestHelpers::Setup
       def setup
+        super
         setup_server
       end
@@ Expand Down @@