diff --git a/spec/node_suite.js b/spec/node_suite.js index 5431a90b..b5285dcd 100644 --- a/spec/node_suite.js +++ b/spec/node_suite.js @@ -169,10 +169,10 @@ process.argv.forEach(function(arg) { specs = []; if (perfSuite) { - specs = getFiles(__dirname + '/javascripts/performance', new RegExp("test.js$")); + specs = getFiles(__dirname + '/performance', new RegExp("test.js$")); } else { - var consoleSpecs = getSpecFiles(__dirname + "/javascripts/console"), - coreSpecs = getSpecFiles(__dirname + "/javascripts/core"), + var consoleSpecs = getSpecFiles(__dirname + "/console"), + coreSpecs = getSpecFiles(__dirname + "/core"), specs = consoleSpecs.concat(coreSpecs); } diff --git a/spec/support/jasmine-performance.yml b/spec/support/jasmine-performance.yml index cd6ad417..d8250010 100644 --- a/spec/support/jasmine-performance.yml +++ b/spec/support/jasmine-performance.yml @@ -2,13 +2,13 @@ src_dir: - 'src' src_files: - '**/*.js' -boot_dir: 'spec/javascripts/support' +boot_dir: 'spec/support' boot_files: - 'dev_boot.js' helpers: - 'helpers/**/*.js' spec_files: - 'performance/performance_test.js' -spec_dir: +spec_dir: spec