From 54c075dc889bbe7e150ecb7d2795b7cc503de1cd Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 30 Dec 2014 13:40:42 -0800 Subject: [PATCH] [Common UI] Reorganize general UI tests Reorganize folder strucutre for tests in bundle platform/commonUI/general; source folder structure has been modified to accommodate additional classes added to support autoflow tabular views, WTD-614, so test folder needs to be reorganized accordingly --- .../ActionGroupControllerSpec.js | 2 +- .../BottomBarControllerSpec.js | 2 +- .../ClickAwayControllerSpec.js | 2 +- .../ContextMenuControllerSpec.js | 2 +- .../{ => controllers}/ToggleControllerSpec.js | 2 +- .../TreeNodeControllerSpec.js | 2 +- .../ViewSwitcherControllerSpec.js | 2 +- .../test/{ => directives}/MCTContainerSpec.js | 2 +- .../test/{ => directives}/MCTDragSpec.js | 2 +- platform/commonUI/general/test/suite.json | 18 +++++++++--------- 10 files changed, 18 insertions(+), 18 deletions(-) rename platform/commonUI/general/test/{ => controllers}/ActionGroupControllerSpec.js (98%) rename platform/commonUI/general/test/{ => controllers}/BottomBarControllerSpec.js (97%) rename platform/commonUI/general/test/{ => controllers}/ClickAwayControllerSpec.js (98%) rename platform/commonUI/general/test/{ => controllers}/ContextMenuControllerSpec.js (96%) rename platform/commonUI/general/test/{ => controllers}/ToggleControllerSpec.js (96%) rename platform/commonUI/general/test/{ => controllers}/TreeNodeControllerSpec.js (99%) rename platform/commonUI/general/test/{ => controllers}/ViewSwitcherControllerSpec.js (98%) rename platform/commonUI/general/test/{ => directives}/MCTContainerSpec.js (98%) rename platform/commonUI/general/test/{ => directives}/MCTDragSpec.js (99%) diff --git a/platform/commonUI/general/test/ActionGroupControllerSpec.js b/platform/commonUI/general/test/controllers/ActionGroupControllerSpec.js similarity index 98% rename from platform/commonUI/general/test/ActionGroupControllerSpec.js rename to platform/commonUI/general/test/controllers/ActionGroupControllerSpec.js index 5177d09f4c..314e070bc5 100644 --- a/platform/commonUI/general/test/ActionGroupControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ActionGroupControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/ActionGroupController"], + ["../../src/controllers/ActionGroupController"], function (ActionGroupController) { "use strict"; diff --git a/platform/commonUI/general/test/BottomBarControllerSpec.js b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js similarity index 97% rename from platform/commonUI/general/test/BottomBarControllerSpec.js rename to platform/commonUI/general/test/controllers/BottomBarControllerSpec.js index c163105416..e26b39add6 100644 --- a/platform/commonUI/general/test/BottomBarControllerSpec.js +++ b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/BottomBarController"], + ["../../src/controllers/BottomBarController"], function (BottomBarController) { "use strict"; diff --git a/platform/commonUI/general/test/ClickAwayControllerSpec.js b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js similarity index 98% rename from platform/commonUI/general/test/ClickAwayControllerSpec.js rename to platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js index 57d81ce59b..024bad4ecb 100644 --- a/platform/commonUI/general/test/ClickAwayControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/ClickAwayController"], + ["../../src/controllers/ClickAwayController"], function (ClickAwayController) { "use strict"; diff --git a/platform/commonUI/general/test/ContextMenuControllerSpec.js b/platform/commonUI/general/test/controllers/ContextMenuControllerSpec.js similarity index 96% rename from platform/commonUI/general/test/ContextMenuControllerSpec.js rename to platform/commonUI/general/test/controllers/ContextMenuControllerSpec.js index bb6aa63f86..ea86ca42f2 100644 --- a/platform/commonUI/general/test/ContextMenuControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ContextMenuControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/ContextMenuController"], + ["../../src/controllers/ContextMenuController"], function (ContextMenuController) { "use strict"; diff --git a/platform/commonUI/general/test/ToggleControllerSpec.js b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js similarity index 96% rename from platform/commonUI/general/test/ToggleControllerSpec.js rename to platform/commonUI/general/test/controllers/ToggleControllerSpec.js index f2059d4c25..f070135ba2 100644 --- a/platform/commonUI/general/test/ToggleControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/ToggleController"], + ["../../src/controllers/ToggleController"], function (ToggleController) { "use strict"; diff --git a/platform/commonUI/general/test/TreeNodeControllerSpec.js b/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js similarity index 99% rename from platform/commonUI/general/test/TreeNodeControllerSpec.js rename to platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js index 62602c501f..ee8f15d7c5 100644 --- a/platform/commonUI/general/test/TreeNodeControllerSpec.js +++ b/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/TreeNodeController"], + ["../../src/controllers/TreeNodeController"], function (TreeNodeController) { "use strict"; diff --git a/platform/commonUI/general/test/ViewSwitcherControllerSpec.js b/platform/commonUI/general/test/controllers/ViewSwitcherControllerSpec.js similarity index 98% rename from platform/commonUI/general/test/ViewSwitcherControllerSpec.js rename to platform/commonUI/general/test/controllers/ViewSwitcherControllerSpec.js index feb86a9cf6..af0b99aa88 100644 --- a/platform/commonUI/general/test/ViewSwitcherControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ViewSwitcherControllerSpec.js @@ -4,7 +4,7 @@ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14. */ define( - ["../src/ViewSwitcherController"], + ["../../src/controllers/ViewSwitcherController"], function (ViewSwitcherController) { "use strict"; diff --git a/platform/commonUI/general/test/MCTContainerSpec.js b/platform/commonUI/general/test/directives/MCTContainerSpec.js similarity index 98% rename from platform/commonUI/general/test/MCTContainerSpec.js rename to platform/commonUI/general/test/directives/MCTContainerSpec.js index 709adc3d82..d90f512180 100644 --- a/platform/commonUI/general/test/MCTContainerSpec.js +++ b/platform/commonUI/general/test/directives/MCTContainerSpec.js @@ -1,7 +1,7 @@ /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ define( - ["../src/MCTContainer"], + ["../../src/directives/MCTContainer"], function (MCTContainer) { "use strict"; diff --git a/platform/commonUI/general/test/MCTDragSpec.js b/platform/commonUI/general/test/directives/MCTDragSpec.js similarity index 99% rename from platform/commonUI/general/test/MCTDragSpec.js rename to platform/commonUI/general/test/directives/MCTDragSpec.js index a5805e1f6b..f73d647111 100644 --- a/platform/commonUI/general/test/MCTDragSpec.js +++ b/platform/commonUI/general/test/directives/MCTDragSpec.js @@ -1,7 +1,7 @@ /*global define,describe,it,expect,beforeEach,jasmine*/ define( - ["../src/MCTDrag"], + ["../../src/directives/MCTDrag"], function (MCTDrag) { "use strict"; diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json index 590628ed91..bbb1b05a19 100644 --- a/platform/commonUI/general/test/suite.json +++ b/platform/commonUI/general/test/suite.json @@ -1,11 +1,11 @@ [ - "ActionGroupController", - "BottomBarController", - "ClickAwayController", - "ContextMenuController", - "MCTContainer", - "MCTDrag", - "ToggleController", - "TreeNodeController", - "ViewSwitcherController" + "controllers/ActionGroupController", + "controllers/BottomBarController", + "controllers/ClickAwayController", + "controllers/ContextMenuController", + "controllers/ToggleController", + "controllers/TreeNodeController", + "controllers/ViewSwitcherController", + "directives/MCTContainer", + "directives/MCTDrag" ] \ No newline at end of file