Fix build

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "8"
+  - "10"
 
 sudo: required
 dist: trusty

package.json

@@ -26,7 +26,7 @@
     "ember-ajax": "^3.0.0",
     "ember-block-slots": "^1.1.11",
     "ember-browserify": "^1.1.9",
-    "ember-cli": "^3.1.3",
+    "ember-cli": "~3.1.4",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.1",
@@ -39,16 +39,16 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-cp-validations": "^3.5.4",
-    "ember-data": "^3.1.2",
+    "ember-data": "~3.1.1",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
-    "ember-flexberry": "^3.0.0",
-    "ember-flexberry-data": "^3.2.0-beta.6",
+    "ember-flexberry": "^3.3.0",
+    "ember-flexberry-data": "^3.3.0",
     "ember-link-action": "0.0.36",
     "ember-load-initializers": "^1.0.0",
     "ember-moment": "^7.6.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "^3.1.3",
+    "ember-source": "~3.1.3",
     "ember-try": "^0.2.23",
     "eslint-plugin-ember": "^5.0.0",
     "eslint-plugin-node": "^5.2.1",

tests/dummy/app/index.html

@@ -9,9 +9,9 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/dummy.css">
-    <link rel="icon" href="/assets/images/favicon.ico">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link rel="icon" type="image/png" href="{{rootURL}}assets/images/favicon.ico">
 
     {{content-for "head-footer"}}
   </head>
@@ -20,8 +20,8 @@
 
     <script src="//cdn.polyfill.io/v1/polyfill.js?features=es6"></script>
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/dummy.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/dummy.js"></script>
 
     {{content-for "body-footer"}}
   </body>

tests/dummy/app/router.js

@@ -2,7 +2,8 @@ import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
 const Router = EmberRouter.extend({
-  location: config.locationType
+  location: config.locationType,
+  rootURL: config.rootURL
 });
 
 Router.map(function () {

tests/dummy/config/environment.js

@@ -14,7 +14,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'hash',
     EmberENV: {
       LOG_STACKTRACE_ON_DEPRECATION:false,
@@ -227,7 +227,7 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
+    ENV.rootURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter

tests/index.html

@@ -10,9 +10,9 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/dummy.css">
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
 
     {{content-for "head-footer"}}
     {{content-for "test-head-footer"}}
@@ -23,12 +23,11 @@
 
     <script src="//cdn.polyfill.io/v1/polyfill.js?features=es6"></script>
 
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/dummy.js"></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/dummy.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}

tests/unit/controllers/ember-flexberry-dummy-application-user-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-application-user-edit', 'Unit | Cont
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'controller:colsconfig-dialog',
+    'service:advLimit',
+    'service:objectlistviewEvents',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-application-user-list-test.js

@@ -6,7 +6,10 @@ moduleFor('controller:ember-flexberry-dummy-application-user-list', 'Unit | Cont
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
-    'controller:colsconfig-dialog' 
+    'service:advLimit',
+    'controller:colsconfig-dialog',
+    'controller:advlimit-dialog',
+    'controller:colsconfig-dialog'
   ]
 });
 

tests/unit/controllers/ember-flexberry-dummy-comment-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-comment-edit', 'Unit | Controller |
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-localization-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-localization-edit', 'Unit | Controll
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-localization-list-test.js

@@ -5,6 +5,9 @@ moduleFor('controller:ember-flexberry-dummy-localization-list', 'Unit | Controll
   // needs: ['controller:foo']
   needs: [
     'controller:colsconfig-dialog',
+    'controller:advlimit-dialog',
+    'controller:colsconfig-dialog',
+    'service:advLimit',
     'service:user-settings',
     'service:objectlistview-events'
   ]

tests/unit/controllers/ember-flexberry-dummy-suggestion-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-suggestion-edit', 'Unit | Controller
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-suggestion-list-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:ember-flexberry-dummy-suggestion-list', 'Unit | Controller
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/ember-flexberry-dummy-suggestion-type-edit-test.js

@@ -6,8 +6,11 @@ moduleFor('controller:ember-flexberry-dummy-suggestion-type-edit', 'Unit | Contr
   needs: [
     'service:user-settings',
     'service:objectlistviewEvents',
+    'service:advLimit',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
     'service:appState',
     'service:detail-interaction'
   ]

tests/unit/controllers/ember-flexberry-dummy-suggestion-type-list-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:ember-flexberry-dummy-suggestion-type-list', 'Unit | Contr
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/ember-flexberry-dummy-test-poly-child-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-test-poly-child-edit', 'Unit | Contr
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'controller:colsconfig-dialog',
+    'service:advLimit',
+    'service:objectlistviewEvents',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-test-poly-child-list-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:ember-flexberry-dummy-test-poly-child-list', 'Unit | Contr
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/ember-flexberry-dummy-test-poly-edit-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:ember-flexberry-dummy-test-poly-edit', 'Unit | Controller
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/ember-flexberry-dummy-test-poly-list-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:ember-flexberry-dummy-test-poly-list', 'Unit | Controller
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-business-audit-objects-audit-entity-e-test.js

@@ -5,9 +5,12 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-business-audit-objects-audit-en
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-business-audit-objects-audit-entity-l-test.js

@@ -7,6 +7,8 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-business-audit-objects-audit-en
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-access-e-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-access-e', 'Unit | Con
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-access-l-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-access-l', 'Unit | Con
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-class-e-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-class-e', 'Unit | Cont
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-class-l-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-class-l', 'Unit | Cont
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-group-e-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-group-e', 'Unit | Cont
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-group-l-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-group-l', 'Unit | Cont
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-link-group-e-test.js

@@ -4,9 +4,12 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-link-group-e', 'Unit |
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
   needs: [
-    'service:objectlistviewEvents',
+    'controller:colsconfig-dialog',
     'controller:lookup-dialog',
     'controller:flexberry-file-view-dialog',
+    'controller:advlimit-dialog',
+    'service:objectlistviewEvents',
+    'service:advLimit',
     'service:user-settings',
     'service:appState',
     'service:detail-interaction'

tests/unit/controllers/i-c-s-soft-s-t-o-r-m-n-e-t-security-link-group-l-test.js

@@ -6,6 +6,8 @@ moduleFor('controller:i-c-s-soft-s-t-o-r-m-n-e-t-security-link-group-l', 'Unit |
   needs: [
     'service:user-settings',
     'service:objectlistview-events',
+    'service:advLimit',
+    'controller:advlimit-dialog',
     'controller:colsconfig-dialog'
   ]
 });