Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit 558280c

Browse files
author
Steffan
committed
update test, dependencies
1 parent 9317ef6 commit 558280c

File tree

10 files changed

+10829
-1155
lines changed

10 files changed

+10829
-1155
lines changed

.circleci/config.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,33 @@
11
version: 2
2+
3+
defaults: &defaults
4+
docker:
5+
- image: circleci/node:8-browsers
6+
environment:
7+
CHROME_BIN: /usr/bin/google-chrome
8+
working_directory: ~/vue-event-manager
9+
210
jobs:
311
build:
4-
docker:
5-
- image: node:8
6-
working_directory: ~/vue-event-manager
12+
<<: *defaults
713
steps:
14+
- run:
15+
name: Update Environment
16+
command: echo 'export PATH=$CIRCLE_WORKING_DIRECTORY/node_modules/.bin:$PATH' >> $BASH_ENV
817
- checkout
918
- restore_cache:
1019
key: yarn-{{ checksum "yarn.lock" }}
1120
- run:
1221
name: Install Dependencies
13-
command: yarn install
22+
command: yarn install --pure-lockfile --cache-folder ~/.yarn
1423
- save_cache:
1524
key: yarn-{{ checksum "yarn.lock" }}
1625
paths:
17-
- ./node_modules
26+
- ~/.yarn
27+
- run:
28+
name: Run Tests
29+
command: |
30+
karma start test/karma.conf.js --single-run --browsers Chrome
1831
- run:
1932
name: Build Release
20-
command: yarn run build
33+
command: yarn run build

package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,25 @@
2121
"url": "git+https://github.com/pagekit/vue-event-manager.git"
2222
},
2323
"scripts": {
24-
"test": "jest --env=node",
2524
"karma": "karma start test/karma.conf.js --single-run",
2625
"build": "node build/build.js",
27-
"release": "node build/release.js",
28-
"webpack": "webpack --config test/webpack.config.js -wd"
26+
"release": "node build/release.js"
2927
},
3028
"devDependencies": {
31-
"buble": "^0.15.2",
29+
"buble": "^0.18.0",
3230
"buble-loader": "^0.4.1",
3331
"jasmine": "^2.8.0",
3432
"jasmine-core": "^2.8.0",
35-
"jest": "^22.0.3",
36-
"karma": "^1.7.1",
33+
"karma": "^2.0.0",
3734
"karma-chrome-launcher": "^2.2.0",
3835
"karma-firefox-launcher": "^1.1.0",
3936
"karma-jasmine": "^1.1.1",
4037
"karma-safari-launcher": "^1.0.0",
4138
"karma-webpack": "^2.0.9",
42-
"replace-in-file": "^2.6.4",
43-
"rollup": "^0.49.3",
44-
"rollup-plugin-buble": "^0.15.0",
45-
"uglify-js": "^3.1.0",
39+
"replace-in-file": "^3.1.0",
40+
"rollup": "^0.52.3",
41+
"rollup-plugin-buble": "^0.18.0",
42+
"uglify-js": "^3.2.2",
4643
"vue": "^2.5.13",
4744
"webpack": "^3.10.0"
4845
}

test/event.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import Vue from 'vue';
22

3-
describe('Vue.eventmanager', () => {
3+
describe('Vue.events', () => {
44

55
it('Trigger Method with one param', () => {
66
new Vue({
77
created() {
88
this.$trigger('someEvent', 'foo');
99
},
1010
events: {
11-
someEvent(param) {
11+
someEvent(param) {
1212
expect(param).toBe('foo');
1313
}
1414
}
@@ -21,7 +21,7 @@ describe('Vue.eventmanager', () => {
2121
this.$trigger('paramArray', ['foo', 'bar']);
2222
},
2323
events: {
24-
paramArray(param, param2) {
24+
paramArray(param, param2) {
2525
expect(param).toBe('foo');
2626
expect(param2).toBe('bar');
2727
}
@@ -35,7 +35,7 @@ describe('Vue.eventmanager', () => {
3535
this.$trigger('paramObject', { foo : 'bar' });
3636
},
3737
events: {
38-
paramObject(param) {
38+
paramObject(param) {
3939
expect(param.foo).toBe('bar');
4040
}
4141
}
@@ -85,25 +85,25 @@ describe('Vue.eventmanager', () => {
8585
}
8686
},
8787
events: {
88-
testEvent(param) {
88+
testEvent(param) {
8989
this.isLoaded = true;
9090
expect(this.isLoaded).toBe(true);
9191
}
9292
}
9393
});
94-
94+
9595
var vm2 = new Vue({
9696
events: {
9797
testEvent:{
98-
handler(param) {
98+
handler(param) {
9999
expect(param).toBe('foo');
100100
},
101101
priority: 10
102102
}
103103
}
104104
});
105105
vm1.$trigger('testEvent', 'foo');
106-
});
106+
});
107107

108108
it('Trigger Method with Cancel Event', () => {
109109

@@ -114,17 +114,17 @@ describe('Vue.eventmanager', () => {
114114
}
115115
},
116116
events: {
117-
actionCancel(param) {
117+
actionCancel(param) {
118118
this.isLoaded = true;
119119
return "lastAction";
120120
}
121121
}
122122
});
123-
123+
124124
var vm2 = new Vue({
125125
events: {
126126
actionCancel:{
127-
handler(param) {
127+
handler(param) {
128128
expect(param).toBe('foo');
129129
return false;
130130
},

test/eventAsync.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue';
22

3-
describe('Vue.eventmanager Async', () => {
3+
describe('Vue.events Async', () => {
44
it('Trigger Method asynchronous', () => {
55
new Vue({
66
data() {
@@ -13,11 +13,11 @@ describe('Vue.eventmanager Async', () => {
1313
this.$trigger('sendParam', 'foo');
1414
},
1515
events: {
16-
setRun() {
16+
setRun() {
1717
this.isRun = true;
1818
expect(this.isRun).toBe(true);
1919
},
20-
sendParam(param) {
20+
sendParam(param) {
2121
expect(this.isRun).toBe(false);
2222
}
2323
}
@@ -33,18 +33,18 @@ describe('Vue.eventmanager Async', () => {
3333
}
3434
},
3535
events: {
36-
testEvent(param) {
36+
testEvent(param) {
3737
this.isLoaded = true;
3838
expect(this.isLoaded).toBe(true);
3939
done();
4040
}
4141
}
4242
});
43-
43+
4444
var vm2 = new Vue({
4545
events: {
4646
testEvent:{
47-
handler(param) {
47+
handler(param) {
4848
expect(param).toBe('foo');
4949
return new Promise((resolve) => {
5050
setTimeout(resolve, 300);

test/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import Vue from 'vue';
2-
import VueEventManager from '../src/index';
2+
import VueEventManager from 'vue-event-manager';
33

44
Vue.use(VueEventManager);
55

6-
x();
7-
86
require('./event');
97
require('./eventAsync');

test/karma.conf.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const webpack = require('../webpack.config');
2+
13
module.exports = config => {
24

35
config.set({
@@ -6,10 +8,9 @@ module.exports = config => {
68
browsers: ['Chrome', 'Safari', 'Firefox'],
79
files: ['index.js'],
810
preprocessors: {
9-
'index.js' : ['webpack']
11+
'index.js': ['webpack']
1012
},
11-
proxies: {
12-
13-
}
13+
webpack
1414
});
15+
1516
};

test/specs.js

Lines changed: 8802 additions & 60 deletions
Large diffs are not rendered by default.

test/webpack.config.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

webpack.config.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* eslint-env node */
2+
3+
module.exports = {
4+
5+
entry: {
6+
'test/specs': './test/index',
7+
},
8+
9+
output: {
10+
filename: './[name].js'
11+
},
12+
13+
resolve: {
14+
alias: {
15+
'vue-event-manager': __dirname + '/src'
16+
}
17+
},
18+
19+
module: {
20+
rules: [
21+
{
22+
test: /\.js$/,
23+
exclude: /node_modules/,
24+
use: 'buble-loader'
25+
}
26+
]
27+
}
28+
29+
};

0 commit comments

Comments
 (0)