Skip to content

Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etpinard merged 4 commits into from
Feb 5, 2018
Merged

Some CI improvements #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e964222
tag gl jasmine specs with '@gl'
etpinard Feb 2, 2018
a1b4872
run @gl jasmine specs in separate job
etpinard Feb 2, 2018
f3af59d
tag some parcoords with @gl
etpinard Feb 2, 2018
a41cc6b
rm @noCI tags from a few specs
etpinard Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
command: |
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
- run:
name: Run jasmine tests
name: Run jasmine tests (batch 1)
command: ./.circleci/test.sh jasmine

test-jasmine2:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:8.9.4-browsers
working_directory: ~/plotly.js
steps:
- checkout
- attach_workspace:
at: ~/plotly.js
- run:
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
command: |
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
- run:
name: Run jasmine tests (batch 2)
command: ./.circleci/test.sh jasmine2

test-image:
docker:
- image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
- test-jasmine:
requires:
- build
- test-jasmine2:
requires:
- build
- test-image:
requires:
- build
Expand Down
13 changes: 9 additions & 4 deletions .circleci/test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

jasmine)
npm run test-jasmine || EXIT_STATE=$?
npm run test-bundle || EXIT_STATE=$?
npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
exit $EXIT_STATE
;;

jasmine2)
npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
npm run test-bundle || EXIT_STATE=$?
exit $EXIT_STATE
;;

Expand All@@ -22,8 +27,8 @@ case $1 in
;;

syntax)
npm run lint || EXIT_STATE=$?
npm run test-syntax || EXIT_STATE=$?
npm run lint || EXIT_STATE=$?
npm run test-syntax || EXIT_STATE=$?
exit $EXIT_STATE
;;

Expand Down
18 changes: 14 additions & 4 deletions test/jasmine/karma.conf.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
' No need to add the `_test.js` suffix, we expand them correctly here.',
' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
' Note that only one bundle test can be run at a time.',
' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
' will run only gl tests.',
' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
' will skip all gl tests.',
'',
'Other options:',
' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
//
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
debug: true
},

// unfortunately a few tests don't behave well on CI
// using `karma-jasmine-spec-tags`
// Options for `karma-jasmine-spec-tags`
// see https://www.npmjs.com/package/karma-jasmine-spec-tags
//
// A few tests don't behave well on CI
// add @noCI to the spec description to skip a spec on CI
//
// Label tests that require a WebGL-context by @gl so that
// they can be skipped using:
// - $ npm run test-jasmine -- --skip-tags=gl
// or run is isolation easily using:
// - $ npm run test-jasmine -- --tags=gl
client: {
tagPrefix: '@',
skipTags: isCI ? 'noCI' : null
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/geo_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
.then(done);
});

it('@noCI should clear hover label when cursor slips off subplot', function(done) {
it('should clear hover label when cursor slips off subplot', function(done) {
var gd = createGraphDiv();
var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/tests/gl2d_click_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
var gd;

function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
});
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
var mockFancy = require('@mocks/gl2d_14.json');
var mockFast = Lib.extendDeep({}, mockFancy, {
data: [{mode: 'markers'}],
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/gl2d_date_axis_render_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

var gd;

Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/gl2d_plot_interact_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
var gd;

beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
});
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
var gd;

beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
});
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
var gd;

var mock = require('@mocks/gl2d_10.json');
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/gl2d_pointcloud_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
.then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

var gd;

Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/gl2d_scatterplot_contour_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
.then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

var gd;

Expand Down
12 changes: 6 additions & 6 deletions test/jasmine/tests/gl3d_plot_interact_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
var gd, ptData;

var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
var gd, modeBar;

function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
});
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
var gd, relayoutCallback;

function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
});
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
var gd;

beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
});
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
var gd;

beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
});
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
var gd;

beforeEach(function() {
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/gl_plot_interact_basic_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
});
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

var gd;

Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/tests/parcoords_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
});
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

beforeAll(function() {
mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
});
});

it('Works with 60 dimensions', function(done) {
it('@noCI Works with 60 dimensions', function(done) {

var mockCopy = Lib.extendDeep({}, mock1);
var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
});
});

it('Truncates 60+ dimensions to 60', function(done) {
it('@noCI Truncates 60+ dimensions to 60', function(done) {

var mockCopy = Lib.extendDeep({}, mock1);
var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
});
});

it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

var mockCopy = Lib.extendDeep({}, mock1);
var newDimension, i, j;
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/polar_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
.then(done);
});

it('@noCI should response to drag interactions on plot area', function(done) {
it('should response to drag interactions on plot area', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

// to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
.then(done);
});

it('@noCI should response to drag interactions on radial drag area', function(done) {
it('should response to drag interactions on radial drag area', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

// to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
.then(done);
});

it('@noCI should response to drag interactions on angular drag area', function(done) {
it('should response to drag interactions on angular drag area', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

// to avoid dragging on hover labels
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Some CI improvements by etpinard · Pull Request #2328 · plotly/plotly.js · GitHub
Skip to content
Some CI improvements#2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

etpinard
merged 4 commits into

from

Feb 5, 2018
 Merged


Some CI improvements
#2328
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e964222

tag gl jasmine specs with '@gl'


etpinard Feb 2, 2018
a1b4872

run @gl jasmine specs in separate job


etpinard Feb 2, 2018
f3af59d

tag some parcoords with @gl


etpinard Feb 2, 2018
a41cc6b

rm @noCI tags from a few specs


etpinard Feb 2, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 21 additions & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,9 +58,26 @@ jobs:
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests
 name: Run jasmine tests (batch 1)
 command: ./.circleci/test.sh jasmine

 test-jasmine2:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
 - attach_workspace:
 at: ~/plotly.js
 - run:
 name: Set timezone to Alaska time (arbitrary timezone to test date logic)
 command: |
 sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
 - run:
 name: Run jasmine tests (batch 2)
 command: ./.circleci/test.sh jasmine2

 test-image:
 docker:
 - image: plotly/testbed:latest
Expand DownExpand Up@@ -100,6 +117,9 @@ workflows:
 - test-jasmine:
 requires:
 - build
 - test-jasmine2:
 requires:
 - build
 - test-image:
 requires:
 - build
Expand Down

13 changes: 9 additions & 4 deletions
.circleci/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,13 @@ EXIT_STATE=0
case $1 in

 jasmine)
 npm run test-jasmine || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 npm run test-jasmine -- --skip-tags=gl,noCI || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

 jasmine2)
 npm run test-jasmine -- --tags=gl --skip-tags=noCI || EXIT_STATE=$?
 npm run test-bundle || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand All@@ -22,8 +27,8 @@ case $1 in
 ;;

 syntax)
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 npm run lint || EXIT_STATE=$?
 npm run test-syntax || EXIT_STATE=$?
 exit $EXIT_STATE
 ;;

Expand Down

18 changes: 14 additions & 4 deletions
test/jasmine/karma.conf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,10 @@ if(argv.info) {
 ' No need to add the `_test.js` suffix, we expand them correctly here.',
 ' - `--bundleTest` set the bundle test suite `test/jasmine/bundle_tests/ to be run.',
 ' Note that only one bundle test can be run at a time.',
 ' - Use `--tags` to specify which `@` tags to test (if any) e.g `npm run test-jasmine -- --tags=gl`',
 ' will run only gl tests.',
 ' - Use `--skip-tags` to specify which `@` tags to skip (if any) e.g `npm run test-jasmine -- --skip-tags=gl`',
 ' will skip all gl tests.',
 '',
 'Other options:',
 ' - `--info`: show this info message',
Expand DownExpand Up@@ -101,9 +105,7 @@ var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToIE9mock = path.join(__dirname, 'assets', 'ie9_mock.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');


function func(config) {

 // level of logging
 // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
 //
Expand DownExpand Up@@ -202,9 +204,17 @@ func.defaultConfig = {
 debug: true
 },

 // unfortunately a few tests don't behave well on CI
 // using `karma-jasmine-spec-tags`
 // Options for `karma-jasmine-spec-tags`
 // see https://www.npmjs.com/package/karma-jasmine-spec-tags
 //
 // A few tests don't behave well on CI
 // add @noCI to the spec description to skip a spec on CI
 //
 // Label tests that require a WebGL-context by @gl so that
 // they can be skipped using:
 // - $ npm run test-jasmine -- --skip-tags=gl
 // or run is isolation easily using:
 // - $ npm run test-jasmine -- --tags=gl
 client: {
 tagPrefix: '@',
 skipTags: isCI ? 'noCI' : null
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/geo_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1072,7 +1072,7 @@ describe('Test geo interactions', function() {
 .then(done);
 });

 it('@noCI should clear hover label when cursor slips off subplot', function(done) {
 it('should clear hover label when cursor slips off subplot', function(done) {
 var gd = createGraphDiv();
 var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));

Expand Down

4 changes: 2 additions & 2 deletions
test/jasmine/tests/gl2d_click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ var mock4 = {
 layout: {}
};

describe('Test hover and click interactions', function() {
describe('@gl Test hover and click interactions', function() {
 var gd;

 function makeHoverFn(gd, x, y) {
Expand DownExpand Up@@ -532,7 +532,7 @@ describe('Test hover and click interactions', function() {
 });
});

describe('@noCI Test gl2d lasso/select:', function() {
describe('@noCI @gl Test gl2d lasso/select:', function() {
 var mockFancy = require('@mocks/gl2d_14.json');
 var mockFast = Lib.extendDeep({}, mockFancy, {
 data: [{mode: 'markers'}],
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_date_axis_render_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');

describe('date axis', function() {
describe('@gl date axis', function() {

 var gd;

Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/gl2d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -85,7 +85,7 @@ describe('Test removal of gl contexts', function() {
 });
});

describe('Test gl plot side effects', function() {
describe('@gl Test gl plot side effects', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -205,7 +205,7 @@ describe('Test gl plot side effects', function() {
 });
});

describe('Test gl2d plots', function() {
describe('@gl Test gl2d plots', function() {
 var gd;

 var mock = require('@mocks/gl2d_10.json');
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_pointcloud_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl pointcloud traces', function() {

 var gd;

Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl2d_scatterplot_contour_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,7 +167,7 @@ function makePlot(gd, mock, done) {
 .then(done);
}

describe('contourgl plots', function() {
describe('@gl contourgl plots', function() {

 var gd;

Expand Down

12 changes: 6 additions & 6 deletions
test/jasmine/tests/gl3d_plot_interact_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ function countCanvases() {
 return d3.selectAll('canvas').size();
}

describe('Test gl3d plots', function() {
describe('@gl Test gl3d plots', function() {
 var gd, ptData;

 var mock = require('@mocks/gl3d_marker-arrays.json');
Expand DownExpand Up@@ -422,7 +422,7 @@ describe('Test gl3d plots', function() {

});

describe('Test gl3d modebar handlers', function() {
describe('@gl Test gl3d modebar handlers', function() {
 var gd, modeBar;

 function assertScenes(cont, attr, val) {
Expand DownExpand Up@@ -650,7 +650,7 @@ describe('Test gl3d modebar handlers', function() {
 });
});

describe('Test gl3d drag and wheel interactions', function() {
describe('@gl Test gl3d drag and wheel interactions', function() {
 var gd, relayoutCallback;

 function scroll(target) {
Expand DownExpand Up@@ -768,7 +768,7 @@ describe('Test gl3d drag and wheel interactions', function() {
 });
});

describe('Test gl3d relayout calls', function() {
describe('@gl Test gl3d relayout calls', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -834,7 +834,7 @@ describe('Test gl3d relayout calls', function() {
 });
});

describe('Test gl3d annotations', function() {
describe('@gl Test gl3d annotations', function() {
 var gd;

 beforeEach(function() {
Expand DownExpand Up@@ -1212,7 +1212,7 @@ describe('Test gl3d annotations', function() {
 });
});

describe('Test removal of gl contexts', function() {
describe('@gl Test removal of gl contexts', function() {
 var gd;

 beforeEach(function() {
Expand Down

2 changes: 1 addition & 1 deletion
test/jasmine/tests/gl_plot_interact_basic_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ function testEvents(plot) {
 });
}

describe('gl3d plots', function() {
describe('@gl gl3d plots', function() {

 var gd;

Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/parcoords_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,7 +242,7 @@ describe('parcoords initialization tests', function() {
 });
});

describe('@noCI parcoords', function() {
describe('@gl parcoords', function() {

 beforeAll(function() {
 mock.data[0].dimensions.forEach(function(d) {
Expand DownExpand Up@@ -404,7 +404,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Works with 60 dimensions', function(done) {
 it('@noCI Works with 60 dimensions', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -434,7 +434,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates 60+ dimensions to 60', function(done) {
 it('@noCI Truncates 60+ dimensions to 60', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand DownExpand Up@@ -462,7 +462,7 @@ describe('@noCI parcoords', function() {
 });
 });

 it('Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {
 it('@noCI Truncates dimension values to the shortest array, retaining only 3 lines', function(done) {

 var mockCopy = Lib.extendDeep({}, mock1);
 var newDimension, i, j;
Expand Down

6 changes: 3 additions & 3 deletions
test/jasmine/tests/polar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -702,7 +702,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on plot area', function(done) {
 it('should response to drag interactions on plot area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -793,7 +793,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on radial drag area', function(done) {
 it('should response to drag interactions on radial drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand DownExpand Up@@ -877,7 +877,7 @@ describe('Test polar interactions:', function() {
 .then(done);
 });

 it('@noCI should response to drag interactions on angular drag area', function(done) {
 it('should response to drag interactions on angular drag area', function(done) {
 var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

 // to avoid dragging on hover labels
Expand Down