Skip to content

Commit

Permalink
fixup local geojson links and mathjax comments
Browse files Browse the repository at this point in the history
  • Loading branch information
archmoj committed Feb 11, 2021
1 parent 3cdbafd commit 343faa8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 1 addition & 2 deletions devtools/test_dashboard/devtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
var Fuse = require('fuse.js/dist/fuse.common.js');
var mocks = require('../../build/test_dashboard_mocks.json');
var credentials = require('../../build/credentials.json');
var constants = require('@src/plots/geo/constants');
var Lib = require('@src/lib');
var d3 = require('../../test/strict-d3');
var d3Json = d3.json;
Expand All @@ -20,7 +19,7 @@ var Tabs = {
Plotly.setPlotConfig({

// use local topojson files
topojsonURL: constants.pathToTopojsonSrc,
topojsonURL: '/node_modules/sane-topojson/dist/',

// register mapbox access token
// run `npm run preset` if you haven't yet
Expand Down
7 changes: 4 additions & 3 deletions test/jasmine/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ var pathToStrictD3 = path.join(__dirname, '..', '..', 'tasks', 'util', 'strict_d
var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
var pathToUnpolyfill = path.join(__dirname, 'assets', 'unpolyfill.js');
var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
var pathToMathJax = path.join(constants.pathToVendor, 'extras', 'mathjax');

var reporters = [];
Expand Down Expand Up @@ -179,11 +180,11 @@ func.defaultConfig = {
files: [
pathToCustomMatchers,
pathToUnpolyfill,
// available to fetch from /base/path/to/mathjax
// available to fetch from /base/vendor/extras/mathjax/
// more info: http://karma-runner.github.io/3.0/config/files.html
{pattern: pathToMathJax + '/**', included: false, watched: false, served: true},
// available to fetch local topojson files
{pattern: constants.pathToTopojsonVendor + '/**', included: false, watched: false, served: true}
// available to fetch from /base/node_modules/sane-topojson/dist/
{pattern: pathToSaneTopojsonDist + '/**', included: false, watched: false, served: true}
],

// list of files / pattern to exclude
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/geo_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;

// use local topojson files
Plotly.setPlotConfig({
topojsonURL: constants.pathToTopojsonSrc
topojsonURL: '/base/node_modules/sane-topojson/dist/'
});

function move(fromX, fromY, toX, toY, delay) {
Expand Down

0 comments on commit 343faa8

Please sign in to comment.