changing paths on tests

This commit is contained in:
Shelby Sturgis 2014-08-10 17:41:36 +03:00
parent 5aea5f2e07
commit 5ed489e1fc
4 changed files with 18 additions and 18 deletions

View file

@ -22,9 +22,9 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
seedColors = Private(require('components/vislib/utils/color/seed_colors'));
getColors = Private(require('components/vislib/utils/color/color'));
error = getColors(str);
seedColors = Private(require('components/vislib/components/_functions/color/seed_colors'));
getColors = Private(require('components/vislib/components/_functions/color/color'));
// error = getColors(str);
color = getColors(arr);
});
});
@ -74,7 +74,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
createColorObj = Private(require('components/vislib/utils/color/color_obj'));
createColorObj = Private(require('components/vislib/components/_functions/color/color_obj'));
dict = createColorObj(arr1, arr2);
});
});
@ -105,7 +105,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
createColorPalette = Private(require('components/vislib/utils/color/color_palette'));
createColorPalette = Private(require('components/vislib/components/_functions/color/color_palette'));
colorPalette = createColorPalette(num1);
});
});

View file

@ -17,7 +17,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
appendElem = Private(require('components/vislib/utils/d3/_append_elem'));
appendElem = Private(require('components/vislib/components/_functions/d3/_append_elem'));
fixture = appendElem('body', 'div', 'test');
fixture1 = appendElem('body', 'div');
});

View file

@ -113,7 +113,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
getLabels = Private(require('components/vislib/utils/labels/labels'));
getLabels = Private(require('components/vislib/components/_functions/labels/labels'));
seriesLabels = getLabels(seriesData);
rowsLabels = getLabels(rowsData);
seriesArr = _.isArray(seriesLabels);
@ -163,7 +163,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
dataArray = Private(require('components/vislib/utils/labels/data_array'));
dataArray = Private(require('components/vislib/components/_functions/labels/data_array'));
seriesLabels = dataArray(seriesData);
rowsLabels = dataArray(rowsData);
testSeries = _.isArray(seriesLabels);
@ -219,7 +219,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
uniqLabels = Private(require('components/vislib/utils/labels/uniq_labels'));
uniqLabels = Private(require('components/vislib/components/_functions/labels/uniq_labels'));
uniq = uniqLabels(arrObj);
testArr = _.isArray(uniq);
});
@ -255,7 +255,7 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
getSeries = Private(require('components/vislib/utils/labels/get_series'));
getSeries = Private(require('components/vislib/components/_functions/labels/get_series'));
columnsLabels = getSeries(columnsData);
rowsLabels = getSeries(rowsData);
seriesLabels = getSeries(seriesData);

View file

@ -109,7 +109,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
injectZeros = Private(require('components/vislib/utils/zero_injection/inject_zeros'));
injectZeros = Private(require('components/vislib/components/_functions/zero_injection/inject_zeros'));
sample1 = injectZeros(data1.series, false);
sample2 = injectZeros(data2.series, ordered);
});
@ -166,7 +166,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
orderXValues = Private(require('components/vislib/utils/zero_injection/ordered_x_keys'));
orderXValues = Private(require('components/vislib/components/_functions/zero_injection/ordered_x_keys'));
results = orderXValues(data2.series);
});
});
@ -198,7 +198,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
uniqueKeys = Private(require('components/vislib/utils/zero_injection/uniq_keys'));
uniqueKeys = Private(require('components/vislib/components/_functions/zero_injection/uniq_keys'));
results = uniqueKeys(data2.series);
});
});
@ -233,7 +233,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
replaceIndex = Private(require('components/vislib/utils/zero_injection/replace_index'));
replaceIndex = Private(require('components/vislib/components/_functions/zero_injection/replace_index'));
results = replaceIndex(arr, index, obj);
});
});
@ -261,7 +261,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
flattenData = Private(require('components/vislib/utils/zero_injection/flatten_data'));
flattenData = Private(require('components/vislib/components/_functions/zero_injection/flatten_data'));
results = flattenData(data2.series);
});
});
@ -293,7 +293,7 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
createZeroArray = Private(require('components/vislib/utils/zero_injection/zero_filled_array'));
createZeroArray = Private(require('components/vislib/components/_functions/zero_injection/zero_filled_array'));
results1 = createZeroArray(arr, ordered);
results2 = createZeroArray(arr, false);
});
@ -354,8 +354,8 @@ define(function (require) {
beforeEach(function () {
inject(function (Private) {
zeroFillArray = Private(require('components/vislib/utils/zero_injection/zero_fill_data_array'));
createZeroArray = Private(require('components/vislib/utils/zero_injection/zero_filled_array'));
zeroFillArray = Private(require('components/vislib/components/_functions/zero_injection/zero_fill_data_array'));
createZeroArray = Private(require('components/vislib/components/_functions/zero_injection/zero_filled_array'));
arr1 = createZeroArray(xValueArr);
// Takes zero array as 1st arg and data array as 2nd arg
results = zeroFillArray(arr1, arr2);