Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Commit a495a18

Browse files
lsbardellsbardel
committed
tests passing in jest
1 parent 2068845 commit a495a18

33 files changed

+2221
-2154
lines changed

‎.circleci/config.yml

Lines changed: 59 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,73 @@
11
version: 2
22
jobs:
3-
tests:
4-
docker:
5-
- image: circleci/node:latest-browsers
6-
steps:
7-
- checkout
8-
- run:
9-
name: install
10-
command: npm install
11-
- run:
12-
name: test
13-
command: npm test
14-
- run:
15-
name: coverage
16-
command: npm run-script test:cover
17-
- run:
18-
name: upload coverage
19-
command: bash <(curl -s https://codecov.io/bash)
20-
- run:
21-
name: remove dev dependencies
22-
command: npm prune --production
23-
- run:
24-
name: run view-require
25-
command: npm run-script test:require
26-
tests-d3-view-test:
27-
docker:
28-
- image: circleci/node:latest
29-
steps:
30-
- checkout
31-
- run:
32-
name: install
33-
command: cd packages/d3-view-test && npm install
34-
- run:
35-
name: test
36-
command: cd packages/d3-view-test && npm test
37-
release:
38-
docker:
39-
- image: circleci/node:latest
40-
steps:
41-
- checkout
42-
- run:
43-
name: install
44-
command: npm install
45-
- run:
46-
name: authenticate
47-
command: .circleci/authenticate.sh
48-
- run:
49-
name: release d3-view
50-
command: npm run-script release
51-
release-d3-view-test:
52-
docker:
53-
- image: circleci/node:latest
54-
steps:
55-
- checkout
56-
- run:
57-
name: install
58-
command: cd packages/d3-view-test && npm install
59-
- run:
60-
name: authenticate
61-
command: .circleci/authenticate.sh
62-
- run:
63-
name: release d3-view-test
64-
command: cd packages/d3-view-test && npm run-script release
3+
tests:
4+
docker:
5+
- image: circleci/node:latest-browsers
6+
steps:
7+
- checkout
8+
- run:
9+
name: install
10+
command: npm install
11+
- run:
12+
name: test
13+
command: npm test
14+
- run:
15+
name: upload coverage
16+
command: bash <(curl -s https://codecov.io/bash)
17+
- run:
18+
name: remove dev dependencies
19+
command: npm prune --production
20+
- run:
21+
name: run view-require
22+
command: npm run-script test:require
23+
tests-d3-view-test:
24+
docker:
25+
- image: circleci/node:latest
26+
steps:
27+
- checkout
28+
- run:
29+
name: install
30+
command: cd packages/d3-view-test && npm install
31+
- run:
32+
name: test
33+
command: cd packages/d3-view-test && npm test
34+
release:
35+
docker:
36+
- image: circleci/node:latest
37+
steps:
38+
- checkout
39+
- run:
40+
name: install
41+
command: npm install
42+
- run:
43+
name: authenticate
44+
command: .circleci/authenticate.sh
45+
- run:
46+
name: release d3-view
47+
command: npm run-script release
48+
release-d3-view-test:
49+
docker:
50+
- image: circleci/node:latest
51+
steps:
52+
- checkout
53+
- run:
54+
name: install
55+
command: cd packages/d3-view-test && npm install
56+
- run:
57+
name: authenticate
58+
command: .circleci/authenticate.sh
59+
- run:
60+
name: release d3-view-test
61+
command: cd packages/d3-view-test && npm run-script release
6562

6663
workflows:
6764
version: 2
6865
build-deploy:
6966
jobs:
7067
- tests
71-
- tests-d3-view-test
7268
- release:
7369
requires:
7470
- tests
7571
filters:
7672
branches:
7773
only: master
78-
- release-d3-view-test:
79-
requires:
80-
- tests-d3-view-test
81-
filters:
82-
branches:
83-
only: master

‎.circleci/firefox.sh

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

‎.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
es6: true
88
browser: true
99
node: true
10+
jest: true
1011

1112
extends:
1213
"eslint:recommended"

‎.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ coverage
99
packages
1010
contributing.md
1111
rollup.config.js
12+
Makefile
1213
.eslintrc

‎Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.PHONY: help
2+
3+
help:
4+
@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
5+
6+
clean: ## remove generated files
7+
rm -rf bin
8+
rm -rf build
9+
rm -rf coverage

‎d3-view.sublime-project

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

‎package.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.2",
2+
"version": "1.5.0",
33
"name": "d3-view",
44
"description": "View-model d3 plugin for building interactive data-driven web interfaces",
55
"author": {
@@ -20,17 +20,16 @@
2020
"node": ">= 6.0"
2121
},
2222
"main": "build/d3-view.js",
23+
"unpkg": "dist/d3-view.min.js",
24+
"jsdelivr": "dist/d3-view.min.js",
2325
"module": "index",
24-
"jsnext:main": "index",
2526
"bin": {
2627
"view-require": "bin/view-require"
2728
},
2829
"dependencies": {
2930
"commander": "2.18",
30-
"d3-dispatch": "1",
3131
"d3-let": "0",
32-
"d3-selection": "1",
33-
"d3-timer": "1"
32+
"d3-transition": "1.1"
3433
},
3534
"devDependencies": {
3635
"@babel/core": "latest",
@@ -44,20 +43,18 @@
4443
"babelify": "10.0",
4544
"browserify": "16.2",
4645
"browserify-istanbul": "3.0",
47-
"d3-transition": "1.1",
4846
"eslint": "5.6",
4947
"handlebars": "4",
5048
"jasmine-core": "3.2",
5149
"jest": "23",
52-
"jsdom": "12.0",
50+
"jsdom": "12",
5351
"publish": "0.6",
5452
"rollup": "0.66",
5553
"rollup-plugin-commonjs": "9.1",
56-
"rollup-plugin-eslint": "5.0",
5754
"rollup-plugin-json": "3.1",
5855
"rollup-plugin-node-resolve": "3.4",
5956
"rollup-plugin-sourcemaps": "0.4",
60-
"rollup-plugin-uglify": "6.0",
57+
"rollup-plugin-terser": "3",
6158
"rollup-watch": "4.3",
6259
"validator": "10.8",
6360
"watchify": "3.11",

‎packages/d3-view-test/package.json

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
11
{
2-
"version": "0.4.0",
3-
"name": "d3-view-test",
4-
"description": "Testing utilities for d3-view",
5-
"author": {
6-
"name": "quantmind.com",
7-
"email": "message@quantmind.com"
8-
},
9-
"keywords": [
10-
"d3",
11-
"d3-module",
12-
"reactive",
13-
"test"
14-
],
15-
"license": "BSD-3-Clause",
16-
"repository": {
17-
"type": "git",
18-
"url": "https://github.com/quantmind/d3-view.git"
19-
},
20-
"engines": {
21-
"node": ">= 6.0"
22-
},
23-
"main": "index.js",
24-
"module": "index",
25-
"jsnext:main": "index",
26-
"dependencies": {
27-
"d3-view": "1.4",
28-
"jsdom": "11.6"
29-
},
30-
"devDependencies": {
31-
"babel-eslint": "8.2",
32-
"eslint": "4.19",
33-
"jest": "22.4",
34-
"publish": "0.6"
35-
},
36-
"scripts": {
37-
"test": "eslint *.js && jest --coverage",
38-
"release": "publish"
39-
}
2+
"version": "0.4.0",
3+
"name": "d3-view-test",
4+
"description": "Testing utilities for d3-view",
5+
"author": {
6+
"name": "quantmind.com",
7+
"email": "message@quantmind.com"
8+
},
9+
"keywords": [
10+
"d3",
11+
"d3-module",
12+
"reactive",
13+
"test"
14+
],
15+
"license": "BSD-3-Clause",
16+
"repository": {
17+
"type": "git",
18+
"url": "https://github.com/quantmind/d3-view.git"
19+
},
20+
"engines": {
21+
"node": ">= 6.0"
22+
},
23+
"main": "index.js",
24+
"module": "index",
25+
"dependencies": {
26+
"d3-view": "1.4"
27+
},
28+
"devDependencies": {
29+
"eslint": "5.6",
30+
"jest": "23",
31+
"publish": "0.6"
32+
},
33+
"scripts": {
34+
"test": "eslint *.js && jest --coverage",
35+
"release": "publish"
36+
}
4037
}

0 commit comments

Comments
 (0)