From 2861644154806109c32e76a476c7d8808f0a31af Mon Sep 17 00:00:00 2001 From: Javier Torres Date: Mon, 24 Apr 2017 17:24:11 +0200 Subject: [PATCH] Avoid loading unneeded files while testing gears This avoids having to stub out the CARTO code referenced from Gear code that is not being tested --- gears/carto_gears_api/lib/carto_gears_api/engine.rb | 7 ++++++- .../test/dummy/app/helpers/app_assets_helper.rb | 2 -- .../test/dummy/app/helpers/application_helper.rb | 2 -- .../test/dummy/app/helpers/cartodb_config_utils.rb | 4 ---- .../test/dummy/app/helpers/frontend_config_helper.rb | 2 -- .../test/dummy/app/helpers/google_analytics_helper.rb | 2 -- .../test/dummy/app/helpers/hubspot_helper.rb | 2 -- .../test/dummy/app/helpers/maps_api_helper.rb | 2 -- .../test/dummy/app/helpers/safe_js_object.rb | 2 -- .../test/dummy/app/helpers/sql_api_helper.rb | 2 -- .../test/dummy/app/helpers/trackjs_helper.rb | 2 -- .../test/dummy/app/models/carto/notification.rb | 6 ------ .../test/dummy/app/models/carto/user_creation.rb | 7 ------- 13 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/app_assets_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/application_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/cartodb_config_utils.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/frontend_config_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/google_analytics_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/hubspot_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/maps_api_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/safe_js_object.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/sql_api_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/helpers/trackjs_helper.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/models/carto/notification.rb delete mode 100644 gears/carto_gears_api/test/dummy/app/models/carto/user_creation.rb diff --git a/gears/carto_gears_api/lib/carto_gears_api/engine.rb b/gears/carto_gears_api/lib/carto_gears_api/engine.rb index c051e871dc..20a230bb24 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/engine.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/engine.rb @@ -3,6 +3,11 @@ module CartoGearsApi isolate_namespace CartoGearsApi lib_path = config.root.join('lib').to_s - config.eager_load_paths << lib_path unless config.eager_load_paths.include?(lib_path) + if Rails.env.test? + # In test environment, only load the required files to avoid including stuff with dependencies to CARTO + config.autoload_paths << lib_path + else + config.eager_load_paths << lib_path unless config.eager_load_paths.include?(lib_path) + end end end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/app_assets_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/app_assets_helper.rb deleted file mode 100644 index 948670a373..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/app_assets_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AppAssetsHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/application_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945c..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/cartodb_config_utils.rb b/gears/carto_gears_api/test/dummy/app/helpers/cartodb_config_utils.rb deleted file mode 100644 index dff029e25b..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/cartodb_config_utils.rb +++ /dev/null @@ -1,4 +0,0 @@ -module CartoDB - module ConfigUtils - end -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/frontend_config_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/frontend_config_helper.rb deleted file mode 100644 index 6e975b03c2..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/frontend_config_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module FrontendConfigHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/google_analytics_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/google_analytics_helper.rb deleted file mode 100644 index afbbc6ed39..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/google_analytics_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module GoogleAnalyticsHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/hubspot_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/hubspot_helper.rb deleted file mode 100644 index 2443db8663..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/hubspot_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module HubspotHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/maps_api_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/maps_api_helper.rb deleted file mode 100644 index 9160472834..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/maps_api_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module MapsApiHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/safe_js_object.rb b/gears/carto_gears_api/test/dummy/app/helpers/safe_js_object.rb deleted file mode 100644 index 8b39d3037e..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/safe_js_object.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SafeJsObject -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/sql_api_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/sql_api_helper.rb deleted file mode 100644 index 15ee9c013f..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/sql_api_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SqlApiHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/helpers/trackjs_helper.rb b/gears/carto_gears_api/test/dummy/app/helpers/trackjs_helper.rb deleted file mode 100644 index 969fd4b3d8..0000000000 --- a/gears/carto_gears_api/test/dummy/app/helpers/trackjs_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TrackjsHelper -end diff --git a/gears/carto_gears_api/test/dummy/app/models/carto/notification.rb b/gears/carto_gears_api/test/dummy/app/models/carto/notification.rb deleted file mode 100644 index 4c40697eb2..0000000000 --- a/gears/carto_gears_api/test/dummy/app/models/carto/notification.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Carto - class Notification - ICON_ALERT = 'alert'.freeze - ICON_SUCCESS = 'success'.freeze - end -end diff --git a/gears/carto_gears_api/test/dummy/app/models/carto/user_creation.rb b/gears/carto_gears_api/test/dummy/app/models/carto/user_creation.rb deleted file mode 100644 index 05bf76a852..0000000000 --- a/gears/carto_gears_api/test/dummy/app/models/carto/user_creation.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Carto::UserCreation - CREATED_VIA_SAML = 'saml'.freeze - CREATED_VIA_LDAP = 'ldap'.freeze - CREATED_VIA_ORG_SIGNUP = 'org_signup'.freeze - CREATED_VIA_API = 'api'.freeze - CREATED_VIA_HTTP_AUTENTICATION = 'http_authentication'.freeze -end