diff --git a/.circleci/config.yml b/.circleci/config.yml index 09b31561959..5585a872c3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,14 +192,14 @@ jobs: steps: - attach_workspace: at: . - - run: npm run test-unit + - run: yarn run test-unit test-render: <<: *defaults steps: - attach_workspace: at: . - - run: npm run test-render + - run: yarn run test-render - store_artifacts: path: "test/integration/render-tests/index.html" @@ -208,7 +208,9 @@ jobs: steps: - attach_workspace: at: . - - run: npm run test-query + - run: yarn run test-query + - store_test_results: + path: test/integration/query-tests - store_artifacts: path: "test/integration/query-tests/index.html" diff --git a/.gitignore b/.gitignore index 24de88105db..eff88a2c80b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,9 @@ test/integration/**/index*.html test/integration/**/actual.png test/integration/**/actual.json test/integration/**/diff.png +test/integration/**/test-results.xml +test/integration/dist/**/*.js +test/integration/dist/**/*.json .eslintcache src/style-spec/dist/index.js _batfish_site diff --git a/build/test/build-tape.js b/build/test/build-tape.js new file mode 100644 index 00000000000..e77fc4dd2c6 --- /dev/null +++ b/build/test/build-tape.js @@ -0,0 +1,18 @@ +/* eslint-disable import/no-commonjs */ +/* eslint-disable flowtype/require-valid-file-annotation */ +const browserify = require('browserify'); +const fs = require('fs'); + +module.exports = function() { + return new Promise((resolve, reject) => { + browserify(require.resolve('../../test/util/tape_config.js'), { standalone: 'tape' }) + .bundle((err, buff) => { + if (err) { throw err; } + + fs.writeFile('test/integration/dist/tape.js', buff, { encoding: 'utf8'}, (err) => { + if (err) { reject(err); } + resolve(); + }); + }); + }); +}; diff --git a/debug/2762.html b/debug/2762.html index 655a2d08ff3..753f0131a2f 100644 --- a/debug/2762.html +++ b/debug/2762.html @@ -15,7 +15,7 @@
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + +