diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 5d49a6f6c..f41d99d47 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -846,7 +846,7 @@ for (var i = scripts.length - 1; i >= 0; i--) { match = scripts[i].src.match(/(.*)apps\/api\/documents\/api.js/i); if (match) { - return match[1] + "test/"; + return match[1] + "test/apps/"; } } diff --git a/test/common/Gateway.js b/test/apps/common/Gateway.js similarity index 100% rename from test/common/Gateway.js rename to test/apps/common/Gateway.js diff --git a/test/common/index.html b/test/apps/common/index.html similarity index 83% rename from test/common/index.html rename to test/apps/common/index.html index ae925d513..2b05f078f 100644 --- a/test/common/index.html +++ b/test/apps/common/index.html @@ -3,12 +3,12 @@ Unit Tests - +
- - + + diff --git a/test/common/locale.js b/test/apps/common/locale.js similarity index 100% rename from test/common/locale.js rename to test/apps/common/locale.js diff --git a/test/common/main/lib/controller/CellEditor.js b/test/apps/common/main/lib/controller/CellEditor.js similarity index 100% rename from test/common/main/lib/controller/CellEditor.js rename to test/apps/common/main/lib/controller/CellEditor.js diff --git a/test/common/main/lib/util/LocalStorage.js b/test/apps/common/main/lib/util/LocalStorage.js similarity index 100% rename from test/common/main/lib/util/LocalStorage.js rename to test/apps/common/main/lib/util/LocalStorage.js diff --git a/test/common/main/lib/util/utils.js b/test/apps/common/main/lib/util/utils.js similarity index 100% rename from test/common/main/lib/util/utils.js rename to test/apps/common/main/lib/util/utils.js diff --git a/test/common/main/lib/view/CellEditor.js b/test/apps/common/main/lib/view/CellEditor.js similarity index 100% rename from test/common/main/lib/view/CellEditor.js rename to test/apps/common/main/lib/view/CellEditor.js diff --git a/test/common/main/lib/view/LoadMask.js b/test/apps/common/main/lib/view/LoadMask.js similarity index 100% rename from test/common/main/lib/view/LoadMask.js rename to test/apps/common/main/lib/view/LoadMask.js diff --git a/test/common/main/resources/img/icon-menu-sprite.svg b/test/apps/common/main/resources/img/icon-menu-sprite.svg similarity index 100% rename from test/common/main/resources/img/icon-menu-sprite.svg rename to test/apps/common/main/resources/img/icon-menu-sprite.svg diff --git a/test/common/main/resources/img/icon-social-sprite.svg b/test/apps/common/main/resources/img/icon-social-sprite.svg similarity index 100% rename from test/common/main/resources/img/icon-social-sprite.svg rename to test/apps/common/main/resources/img/icon-social-sprite.svg diff --git a/test/common/main/resources/img/logo.svg b/test/apps/common/main/resources/img/logo.svg similarity index 100% rename from test/common/main/resources/img/logo.svg rename to test/apps/common/main/resources/img/logo.svg diff --git a/test/common/main/resources/img/next-field.png b/test/apps/common/main/resources/img/next-field.png similarity index 100% rename from test/common/main/resources/img/next-field.png rename to test/apps/common/main/resources/img/next-field.png diff --git a/test/common/main/resources/img/previous-field.png b/test/apps/common/main/resources/img/previous-field.png similarity index 100% rename from test/common/main/resources/img/previous-field.png rename to test/apps/common/main/resources/img/previous-field.png diff --git a/test/common/main/resources/less/asc-mixins.less b/test/apps/common/main/resources/less/asc-mixins.less similarity index 100% rename from test/common/main/resources/less/asc-mixins.less rename to test/apps/common/main/resources/less/asc-mixins.less diff --git a/test/common/main/resources/less/buttons.less b/test/apps/common/main/resources/less/buttons.less similarity index 100% rename from test/common/main/resources/less/buttons.less rename to test/apps/common/main/resources/less/buttons.less diff --git a/test/common/main/resources/less/colors-table-ie-fix.less b/test/apps/common/main/resources/less/colors-table-ie-fix.less similarity index 100% rename from test/common/main/resources/less/colors-table-ie-fix.less rename to test/apps/common/main/resources/less/colors-table-ie-fix.less diff --git a/test/common/main/resources/less/colors-table.less b/test/apps/common/main/resources/less/colors-table.less similarity index 100% rename from test/common/main/resources/less/colors-table.less rename to test/apps/common/main/resources/less/colors-table.less diff --git a/test/common/main/resources/less/common.less b/test/apps/common/main/resources/less/common.less similarity index 93% rename from test/common/main/resources/less/common.less rename to test/apps/common/main/resources/less/common.less index 64f80cea2..7797bc79a 100644 --- a/test/common/main/resources/less/common.less +++ b/test/apps/common/main/resources/less/common.less @@ -1,25 +1,25 @@ // Core variables and mixins -@import "../../../../../vendor/bootstrap/less/variables.less"; +@import "../../../../../../vendor/bootstrap/less/variables.less"; @icon-font-path: "../../../../../../vendor/bootstrap/dist/fonts/"; -@import "../../../../../vendor/bootstrap/less/mixins.less"; +@import "../../../../../../vendor/bootstrap/less/mixins.less"; // Reset -@import "../../../../../vendor/bootstrap/less/normalize.less"; -@import "../../../../../vendor/bootstrap/less/print.less"; +@import "../../../../../../vendor/bootstrap/less/normalize.less"; +@import "../../../../../../vendor/bootstrap/less/print.less"; // Core CSS -@import "../../../../../vendor/bootstrap/less/scaffolding.less"; -@import "../../../../../vendor/bootstrap/less/type.less"; +@import "../../../../../../vendor/bootstrap/less/scaffolding.less"; +@import "../../../../../../vendor/bootstrap/less/type.less"; //@import "code.less"; //@import "grid.less"; //@import "tables.less"; -@import "../../../../../vendor/bootstrap/less/forms.less"; -@import "../../../../../vendor/bootstrap/less/buttons.less"; +@import "../../../../../../vendor/bootstrap/less/forms.less"; +@import "../../../../../../vendor/bootstrap/less/buttons.less"; // Components -@import "../../../../../vendor/bootstrap/less/component-animations.less"; +@import "../../../../../../vendor/bootstrap/less/component-animations.less"; //@import "../../../../../../vendor/bootstrap/less/glyphicons.less"; //@import "dropdowns.less"; //@import "button-groups.less"; @@ -29,28 +29,28 @@ //@import "breadcrumbs.less"; //@import "pagination.less"; //@import "pager.less"; -@import "../../../../../vendor/bootstrap/less/labels.less"; +@import "../../../../../../vendor/bootstrap/less/labels.less"; //@import "badges.less"; //@import "jumbotron.less"; //@import "thumbnails.less"; -@import "../../../../../vendor/bootstrap/less/alerts.less"; +@import "../../../../../../vendor/bootstrap/less/alerts.less"; //@import "progress-bars.less"; //@import "media.less"; //@import "list-group.less"; //@import "panels.less"; //@import "wells.less"; -@import "../../../../../vendor/bootstrap/less/close.less"; +@import "../../../../../../vendor/bootstrap/less/close.less"; // Components w/ JavaScript -@import "../../../../../vendor/bootstrap/less/modals.less"; -@import "../../../../../vendor/bootstrap/less/tooltip.less"; +@import "../../../../../../vendor/bootstrap/less/modals.less"; +@import "../../../../../../vendor/bootstrap/less/tooltip.less"; //@import "../../../../../../vendor/bootstrap/less/popovers.less"; -@import "../../../../../vendor/bootstrap/less/dropdowns.less"; +@import "../../../../../../vendor/bootstrap/less/dropdowns.less"; //@import "carousel.less"; // Utility classes -@import "../../../../../vendor/bootstrap/less/utilities.less"; -@import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; +@import "../../../../../../vendor/bootstrap/less/utilities.less"; +@import "../../../../../../vendor/bootstrap/less/responsive-utilities.less"; @import "loadmask.less"; diff --git a/test/common/main/resources/less/loadmask.less b/test/apps/common/main/resources/less/loadmask.less similarity index 100% rename from test/common/main/resources/less/loadmask.less rename to test/apps/common/main/resources/less/loadmask.less diff --git a/test/common/main/resources/less/variables.less b/test/apps/common/main/resources/less/variables.less similarity index 100% rename from test/common/main/resources/less/variables.less rename to test/apps/common/main/resources/less/variables.less diff --git a/test/documenteditor/main/index.html b/test/apps/documenteditor/main/index.html similarity index 88% rename from test/documenteditor/main/index.html rename to test/apps/documenteditor/main/index.html index 92d49a56a..05c595d01 100644 --- a/test/documenteditor/main/index.html +++ b/test/apps/documenteditor/main/index.html @@ -20,7 +20,7 @@ - + - - + + + - - + + - + - + diff --git a/test/documenteditor/main/js/ApplicationController.js b/test/apps/documenteditor/main/js/ApplicationController.js similarity index 100% rename from test/documenteditor/main/js/ApplicationController.js rename to test/apps/documenteditor/main/js/ApplicationController.js diff --git a/test/documenteditor/main/js/ApplicationView.js b/test/apps/documenteditor/main/js/ApplicationView.js similarity index 100% rename from test/documenteditor/main/js/ApplicationView.js rename to test/apps/documenteditor/main/js/ApplicationView.js diff --git a/test/documenteditor/main/js/application.js b/test/apps/documenteditor/main/js/application.js similarity index 100% rename from test/documenteditor/main/js/application.js rename to test/apps/documenteditor/main/js/application.js diff --git a/test/documenteditor/main/resources/less/application.less b/test/apps/documenteditor/main/resources/less/application.less similarity index 100% rename from test/documenteditor/main/resources/less/application.less rename to test/apps/documenteditor/main/resources/less/application.less diff --git a/test/presentationeditor/main/index.html b/test/apps/presentationeditor/main/index.html similarity index 90% rename from test/presentationeditor/main/index.html rename to test/apps/presentationeditor/main/index.html index 08b1a3410..30c8c7282 100644 --- a/test/presentationeditor/main/index.html +++ b/test/apps/presentationeditor/main/index.html @@ -40,7 +40,7 @@ - + - - - - + + + + + - + - + - + - - + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file