Skip to content

Commit 343faa8

Browse files
committed
fixup local geojson links and mathjax comments
1 parent 3cdbafd commit 343faa8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

devtools/test_dashboard/devtools.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
var Fuse = require('fuse.js/dist/fuse.common.js');
66
var mocks = require('../../build/test_dashboard_mocks.json');
77
var credentials = require('../../build/credentials.json');
8-
var constants = require('@src/plots/geo/constants');
98
var Lib = require('@src/lib');
109
var d3 = require('../../test/strict-d3');
1110
var d3Json = d3.json;
@@ -20,7 +19,7 @@ var Tabs = {
2019
Plotly.setPlotConfig({
2120

2221
// use local topojson files
23-
topojsonURL: constants.pathToTopojsonSrc,
22+
topojsonURL: '/node_modules/sane-topojson/dist/',
2423

2524
// register mapbox access token
2625
// run `npm run preset` if you haven't yet

test/jasmine/karma.conf.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ var pathToStrictD3 = path.join(__dirname, '..', '..', 'tasks', 'util', 'strict_d
121121
var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
122122
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
123123
var pathToUnpolyfill = path.join(__dirname, 'assets', 'unpolyfill.js');
124+
var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
124125
var pathToMathJax = path.join(constants.pathToVendor, 'extras', 'mathjax');
125126

126127
var reporters = [];
@@ -179,11 +180,11 @@ func.defaultConfig = {
179180
files: [
180181
pathToCustomMatchers,
181182
pathToUnpolyfill,
182-
// available to fetch from /base/path/to/mathjax
183+
// available to fetch from /base/vendor/extras/mathjax/
183184
// more info: http://karma-runner.github.io/3.0/config/files.html
184185
{pattern: pathToMathJax + '/**', included: false, watched: false, served: true},
185-
// available to fetch local topojson files
186-
{pattern: constants.pathToTopojsonVendor + '/**', included: false, watched: false, served: true}
186+
// available to fetch from /base/node_modules/sane-topojson/dist/
187+
{pattern: pathToSaneTopojsonDist + '/**', included: false, watched: false, served: true}
187188
],
188189

189190
// list of files / pattern to exclude

test/jasmine/tests/geo_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
2424

2525
// use local topojson files
2626
Plotly.setPlotConfig({
27-
topojsonURL: constants.pathToTopojsonSrc
27+
topojsonURL: '/base/node_modules/sane-topojson/dist/'
2828
});
2929

3030
function move(fromX, fromY, toX, toY, delay) {

0 commit comments

Comments
 (0)