diff --git a/front/package.json b/front/package.json index 58c22a4082c4d37762c32a3e23e7edf453a7fbca..e79ffcbebab4b40238fa5aa98eae3097b1b13b1f 100644 --- a/front/package.json +++ b/front/package.json @@ -46,6 +46,7 @@ "cross-env": "^4.0.0", "cross-spawn": "^5.0.1", "css-loader": "^0.28.0", + "es6-promise": "^4.2.2", "eslint": "^3.19.0", "eslint-config-standard": "^6.2.1", "eslint-friendly-formatter": "^2.0.7", diff --git a/front/src/assets/logo/favicon.ico b/front/src/assets/logo/favicon.png similarity index 100% rename from front/src/assets/logo/favicon.ico rename to front/src/assets/logo/favicon.png diff --git a/front/src/config.js b/front/src/config.js index 3ba1247acf21ec5564cff0b9975030c84bcb4908..76a6f5e5fdd0a5ef4756d0da2e0d96d171817b78 100644 --- a/front/src/config.js +++ b/front/src/config.js @@ -4,7 +4,7 @@ class Config { if (this.BACKEND_URL === '/') { this.BACKEND_URL = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port } - if (!this.BACKEND_URL.endsWith('/')) { + if (!this.BACKEND_URL.slice(-1) === '/') { this.BACKEND_URL += '/' } this.API_URL = this.BACKEND_URL + 'api/v1/' diff --git a/front/test/unit/karma.conf.js b/front/test/unit/karma.conf.js index 3fcc5f02ac8f054bf8384927220513ebd9b89ac4..da5a2187663e2479f48a0c2ccefac20927c0f049 100644 --- a/front/test/unit/karma.conf.js +++ b/front/test/unit/karma.conf.js @@ -14,7 +14,10 @@ module.exports = function (config) { browsers: ['PhantomJS'], frameworks: ['mocha', 'sinon-chai', 'phantomjs-shim'], reporters: ['spec', 'coverage'], - files: ['./index.js'], + files: [ + '../../node_modules/es6-promise/dist/es6-promise.auto.js', + './index.js' + ], preprocessors: { './index.js': ['webpack', 'sourcemap'] }, diff --git a/front/test/unit/specs/Hello.spec.js b/front/test/unit/specs/Hello.spec.js deleted file mode 100644 index 80140baa9664664d35751ce9c16e0d9ccbe75427..0000000000000000000000000000000000000000 --- a/front/test/unit/specs/Hello.spec.js +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue' -import Hello from '@/components/Hello' - -describe('Hello.vue', () => { - it('should render correct contents', () => { - const Constructor = Vue.extend(Hello) - const vm = new Constructor().$mount() - expect(vm.$el.querySelector('.hello h1').textContent) - .to.equal('Welcome to Your Vue.js App') - }) -})