Canh Ngo pushed to branch feature/cmng-psp1-CHANNELMGR-467 at cms-community /
hippo-addon-channel-manager
Commits:
af7c0ced by Joeri de Gooijer at 2016-03-17T13:54:39+01:00
CHANNELMGR-468 make eslint happy
- - - - -
07ded9b9 by Joeri de Gooijer at 2016-03-17T14:34:52+01:00
CHANNELMGR-504 remove duplicate use strict statement, add use strict to
mock.environment.spec.js
- - - - -
626b4e66 by Canh Ngo at 2016-03-17T15:12:51+01:00
CHANNELMGR-467: merged mainline changes to issue branch
- - - - -
4 changed files:
- frontend-ng/karma.conf.js
- frontend-ng/src/angularjs/channel/channel.spec.js
- frontend-ng/src/angularjs/hippo-cm.spec.js
- frontend-ng/src/angularjs/mock.environment.spec.js
Changes:
=====================================
frontend-ng/karma.conf.js
=====================================
--- a/frontend-ng/karma.conf.js
+++ b/frontend-ng/karma.conf.js
@@ -42,12 +42,13 @@ module.exports = function karmaConfig(config) {
cfg.src.unitTests,
cfg.src.fixtures,
{
- pattern: cfg.bowerDir + '/dragula.js/dist/dragula.min.+(css|js)',
included: false
+ pattern: `${cfg.bowerDir}/dragula.js/dist/dragula.min.+(css|js)`,
+ included: false,
},
];
- options.proxies['/styles/dragula.min.css'] = '/base/' + cfg.bowerDir +
'/dragula.js/dist/dragula.min.css';
- options.proxies['/scripts/dragula.min.js'] = '/base/' + cfg.bowerDir +
'/dragula.js/dist/dragula.min.js';
+ options.proxies['/styles/dragula.min.css'] =
`/base/${cfg.bowerDir}/dragula.js/dist/dragula.min.css`;
+ options.proxies['/scripts/dragula.min.js'] =
`/base/${cfg.bowerDir}/dragula.js/dist/dragula.min.js`;
config.set(options);
};
=====================================
frontend-ng/src/angularjs/channel/channel.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/channel.spec.js
+++ b/frontend-ng/src/angularjs/channel/channel.spec.js
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-'use strict';
-
describe('The hippo-cm.channel module', () => {
'use strict';
=====================================
frontend-ng/src/angularjs/hippo-cm.spec.js
=====================================
--- a/frontend-ng/src/angularjs/hippo-cm.spec.js
+++ b/frontend-ng/src/angularjs/hippo-cm.spec.js
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-'use strict';
-
describe('The hippo-cm module', () => {
'use strict';
=====================================
frontend-ng/src/angularjs/mock.environment.spec.js
=====================================
--- a/frontend-ng/src/angularjs/mock.environment.spec.js
+++ b/frontend-ng/src/angularjs/mock.environment.spec.js
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+'use strict';
+
function createMessageBus() {
const subscriptions = {};
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/1c97783d9bf0324f348ede9afb34674a9902f429...626b4e66db07160616fd4ace83e2886950d58552
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
