diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/base.js | 4 | ||||
| -rw-r--r-- | tests/output/test_analyzer.js.stdout | 4 | ||||
| -rw-r--r-- | tests/output/test_globals.js.stdout | 4 | ||||
| -rw-r--r-- | tests/output/test_require_js.js.stdout | 4 | ||||
| -rw-r--r-- | tests/test_app.js | 2 | ||||
| -rw-r--r-- | tests/test_globals.js | 2 | ||||
| -rw-r--r-- | tests/test_require_js.js | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/tests/base.js b/tests/base.js index 72ce28b4..7552c694 100644 --- a/tests/base.js +++ b/tests/base.js @@ -46,8 +46,8 @@ function run_tests(settings) { settings.created(undefined, window); } debugger - addScript(window, '../scripts/external/require.js') - .load_next('../scripts/app.js') + addScript(window, '../src/external/require.js') + .load_next('../src/app.js') .done(function () { console.log('test harness: starting script loading with requirejs'); window.require.config(window.rhizi_require_config); diff --git a/tests/output/test_analyzer.js.stdout b/tests/output/test_analyzer.js.stdout index 82db6dce..7e15edcb 100644 --- a/tests/output/test_analyzer.js.stdout +++ b/tests/output/test_analyzer.js.stdout @@ -1,6 +1,6 @@ -addScript: loaded ../scripts/external/require.js +addScript: loaded ../src/external/require.js app: running under node -addScript: loaded ../scripts/app.js +addScript: loaded ../src/app.js test harness: starting script loading with requirejs test harness: main loaded Rhizi main started diff --git a/tests/output/test_globals.js.stdout b/tests/output/test_globals.js.stdout index a6b915ca..9aa7f822 100644 --- a/tests/output/test_globals.js.stdout +++ b/tests/output/test_globals.js.stdout @@ -1,7 +1,7 @@ before fields count: 187 -addScript: loaded ../scripts/external/require.js +addScript: loaded ../src/external/require.js app: running under node -addScript: loaded ../scripts/app.js +addScript: loaded ../src/app.js test harness: starting script loading with requirejs test harness: main loaded Rhizi main started diff --git a/tests/output/test_require_js.js.stdout b/tests/output/test_require_js.js.stdout index 821c4a6d..82ea089e 100644 --- a/tests/output/test_require_js.js.stdout +++ b/tests/output/test_require_js.js.stdout @@ -1,4 +1,4 @@ -addScript: loaded ../scripts/external/require.js +addScript: loaded ../src/external/require.js test_app: running under node addScript: loaded test_app.js callback after test_app.js loading @@ -9,7 +9,7 @@ callback after test_app.js loading d3: 'external/d3/d3', autocomplete: 'external/autocomplete', FileSaver: 'external/FileSaver' }, - baseUrl: '../scripts/' } + baseUrl: '../src/' } hello from test factory here we are after test_app prerequisites 42 diff --git a/tests/test_app.js b/tests/test_app.js index 91f6b6cd..6696c1fc 100644 --- a/tests/test_app.js +++ b/tests/test_app.js @@ -26,7 +26,7 @@ define('test', function() { }); console.log('test_app: running under node'); -config.baseUrl = '../scripts/'; +config.baseUrl = '../src/'; document.config = config; }()); diff --git a/tests/test_globals.js b/tests/test_globals.js index afd79ecf..03dd1cf9 100644 --- a/tests/test_globals.js +++ b/tests/test_globals.js @@ -1,5 +1,5 @@ var base = require('./base'); -var util = require('../scripts/util'); +var util = require('../src/util'); var count; diff --git a/tests/test_require_js.js b/tests/test_require_js.js index 9cecc019..aa71018e 100644 --- a/tests/test_require_js.js +++ b/tests/test_require_js.js @@ -6,7 +6,7 @@ var addScript = require('./test_util').addScript; window.console.log = console.log; window.is_node = true; -addScript(window, '../scripts/external/require.js') +addScript(window, '../src/external/require.js') .load_next('test_app.js') .done(function () { var config = document.config |
