From fe9f4a1c95d6201bc9b8a22c6f6d0d851f08b8da Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Wed, 17 Oct 2018 12:16:33 +0100 Subject: [PATCH] Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead --- app/assets/javascripts/admin/customers/customers.js.coffee | 2 +- .../javascripts/admin/subscriptions/subscriptions.js.coffee | 2 +- .../admin/{ => utils}/services/country_states.js.coffee | 2 +- .../admin/{ => utils}/services/country_states_spec.js.coffee | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/admin/{ => utils}/services/country_states.js.coffee (84%) rename spec/javascripts/unit/admin/{ => utils}/services/country_states_spec.js.coffee (98%) diff --git a/app/assets/javascripts/admin/customers/customers.js.coffee b/app/assets/javascripts/admin/customers/customers.js.coffee index aa8a1cfc19..fe8ae1de5b 100644 --- a/app/assets/javascripts/admin/customers/customers.js.coffee +++ b/app/assets/javascripts/admin/customers/customers.js.coffee @@ -1 +1 @@ -angular.module("admin.customers", ['ngResource', 'admin.tagRules', 'admin.indexUtils', 'admin.utils', 'admin.dropdown', 'ofn.admin']) +angular.module("admin.customers", ['ngResource', 'admin.tagRules', 'admin.indexUtils', 'admin.utils', 'admin.dropdown']) diff --git a/app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee b/app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee index 066552b598..9e2c3d5696 100644 --- a/app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee +++ b/app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee @@ -1 +1 @@ -angular.module("admin.subscriptions", ['ngResource','admin.indexUtils','admin.dropdown', 'ofn.admin']) +angular.module("admin.subscriptions", ['ngResource','admin.indexUtils','admin.dropdown']) diff --git a/app/assets/javascripts/admin/services/country_states.js.coffee b/app/assets/javascripts/admin/utils/services/country_states.js.coffee similarity index 84% rename from app/assets/javascripts/admin/services/country_states.js.coffee rename to app/assets/javascripts/admin/utils/services/country_states.js.coffee index 7977bc3535..30161b5bb0 100644 --- a/app/assets/javascripts/admin/services/country_states.js.coffee +++ b/app/assets/javascripts/admin/utils/services/country_states.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").factory "CountryStates", ($filter) -> +angular.module("admin.utils").factory "CountryStates", ($filter) -> new class CountryStates statesFor: (countries, country_id) -> diff --git a/spec/javascripts/unit/admin/services/country_states_spec.js.coffee b/spec/javascripts/unit/admin/utils/services/country_states_spec.js.coffee similarity index 98% rename from spec/javascripts/unit/admin/services/country_states_spec.js.coffee rename to spec/javascripts/unit/admin/utils/services/country_states_spec.js.coffee index 5b3683b9d7..6e5247cdb7 100644 --- a/spec/javascripts/unit/admin/services/country_states_spec.js.coffee +++ b/spec/javascripts/unit/admin/utils/services/country_states_spec.js.coffee @@ -10,7 +10,7 @@ describe "CountryStates service", -> ] beforeEach -> - module('ofn.admin') + module('admin.utils') inject (CountryStates) -> countryStates = CountryStates