From 719907189f6d97e2c19202201943ba4ec41c1316 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 13 Jun 2015 09:58:08 -0500 Subject: [PATCH] Organized spec folder --- .gitignore | 2 +- karma.conf.js | 4 ++-- test/spec/{ => controllers}/authCtrlSpec.js | 0 test/spec/{ => controllers}/filtersCtrlSpec.js | 0 test/spec/{ => controllers}/groupCtrlSpec.js | 0 test/spec/{ => controllers}/hallCtrlSpec.js | 0 test/spec/{ => controllers}/headerCtrlSpec.js | 0 test/spec/{ => controllers}/inventoryCtrlSpec.js | 0 test/spec/{ => controllers}/rootCtrlSpec.js | 0 test/spec/{mock => mocks}/mixpanelMock.js | 0 test/spec/{ => services}/groupServicesSpec.js | 0 test/spec/{ => services}/memberServicesSpec.js | 0 test/spec/{ => services}/notificationServicesSpec.js | 0 test/spec/{ => services}/userServicesSpec.js | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename test/spec/{ => controllers}/authCtrlSpec.js (100%) rename test/spec/{ => controllers}/filtersCtrlSpec.js (100%) rename test/spec/{ => controllers}/groupCtrlSpec.js (100%) rename test/spec/{ => controllers}/hallCtrlSpec.js (100%) rename test/spec/{ => controllers}/headerCtrlSpec.js (100%) rename test/spec/{ => controllers}/inventoryCtrlSpec.js (100%) rename test/spec/{ => controllers}/rootCtrlSpec.js (100%) rename test/spec/{mock => mocks}/mixpanelMock.js (100%) rename test/spec/{ => services}/groupServicesSpec.js (100%) rename test/spec/{ => services}/memberServicesSpec.js (100%) rename test/spec/{ => services}/notificationServicesSpec.js (100%) rename test/spec/{ => services}/userServicesSpec.js (100%) diff --git a/.gitignore b/.gitignore index 002780bbdc..4ae45467dc 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,4 @@ coverage coverage.html common/dist/scripts/habitrpg-shared.js -test/spec/translations.js +test/spec/mocks/translations.js diff --git a/karma.conf.js b/karma.conf.js index 0b79578199..a67cdb6c0a 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -35,7 +35,7 @@ module.exports = function(config) { 'website/public/bower_components/js-emoji/emoji.js', 'common/dist/scripts/habitrpg-shared.js', - "test/spec/translations.js", + "test/spec/mocks/translations.js", "website/public/js/env.js", @@ -77,7 +77,7 @@ module.exports = function(config) { "website/public/js/controllers/footerCtrl.js", "website/public/js/controllers/challengesCtrl.js", "website/public/js/controllers/hallCtrl.js", - 'test/spec/mock/**/*.js', + 'test/spec/mocks/**/*.js', 'test/spec/specHelper.js', 'test/spec/**/*.js' ], diff --git a/test/spec/authCtrlSpec.js b/test/spec/controllers/authCtrlSpec.js similarity index 100% rename from test/spec/authCtrlSpec.js rename to test/spec/controllers/authCtrlSpec.js diff --git a/test/spec/filtersCtrlSpec.js b/test/spec/controllers/filtersCtrlSpec.js similarity index 100% rename from test/spec/filtersCtrlSpec.js rename to test/spec/controllers/filtersCtrlSpec.js diff --git a/test/spec/groupCtrlSpec.js b/test/spec/controllers/groupCtrlSpec.js similarity index 100% rename from test/spec/groupCtrlSpec.js rename to test/spec/controllers/groupCtrlSpec.js diff --git a/test/spec/hallCtrlSpec.js b/test/spec/controllers/hallCtrlSpec.js similarity index 100% rename from test/spec/hallCtrlSpec.js rename to test/spec/controllers/hallCtrlSpec.js diff --git a/test/spec/headerCtrlSpec.js b/test/spec/controllers/headerCtrlSpec.js similarity index 100% rename from test/spec/headerCtrlSpec.js rename to test/spec/controllers/headerCtrlSpec.js diff --git a/test/spec/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js similarity index 100% rename from test/spec/inventoryCtrlSpec.js rename to test/spec/controllers/inventoryCtrlSpec.js diff --git a/test/spec/rootCtrlSpec.js b/test/spec/controllers/rootCtrlSpec.js similarity index 100% rename from test/spec/rootCtrlSpec.js rename to test/spec/controllers/rootCtrlSpec.js diff --git a/test/spec/mock/mixpanelMock.js b/test/spec/mocks/mixpanelMock.js similarity index 100% rename from test/spec/mock/mixpanelMock.js rename to test/spec/mocks/mixpanelMock.js diff --git a/test/spec/groupServicesSpec.js b/test/spec/services/groupServicesSpec.js similarity index 100% rename from test/spec/groupServicesSpec.js rename to test/spec/services/groupServicesSpec.js diff --git a/test/spec/memberServicesSpec.js b/test/spec/services/memberServicesSpec.js similarity index 100% rename from test/spec/memberServicesSpec.js rename to test/spec/services/memberServicesSpec.js diff --git a/test/spec/notificationServicesSpec.js b/test/spec/services/notificationServicesSpec.js similarity index 100% rename from test/spec/notificationServicesSpec.js rename to test/spec/services/notificationServicesSpec.js diff --git a/test/spec/userServicesSpec.js b/test/spec/services/userServicesSpec.js similarity index 100% rename from test/spec/userServicesSpec.js rename to test/spec/services/userServicesSpec.js