diff --git a/Gruntfile.js b/Gruntfile.js index abdf5915..e4b271a2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -195,8 +195,8 @@ module.exports = function(grunt) { command: 'git add build/' }, casperTest: { - command: 'casperjs test ./src/__tests__/casperjs/*_test.js || ' + - 'open ./src/__tests__/casperjs/screenshots/*.png' + command: 'echo "Running $(ls -1 ./src/__tests__/casperjs/*_test.js | wc -l) tests" && ' + + 'ls -1 ./src/__tests__/casperjs/*_test.js | while IFS= read -r line; do casperjs test $line; done' } }, jasmine_node: { diff --git a/src/__tests__/casperjs/casperUtils.js b/src/__tests__/casperjs/casperUtils.js index 6e3a9d10..2dba0283 100644 --- a/src/__tests__/casperjs/casperUtils.js +++ b/src/__tests__/casperjs/casperUtils.js @@ -109,7 +109,7 @@ var CasperUtils = { intlKeyReturns: function(key, text) { return function then() { this.test.assertEvalEquals(function(key) { - return debug_Intl_str(key); + return intl.str(key); }, text, 'Checking that intl key "' + key + '" contains "' + diff --git a/src/__tests__/casperjs/command_history_test.js b/src/__tests__/casperjs/command_history_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/command_type_test.js b/src/__tests__/casperjs/command_type_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/helper_bar_intl_test.js b/src/__tests__/casperjs/helper_bar_intl_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_dropdown_keyboard_test.js b/src/__tests__/casperjs/level_dropdown_keyboard_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_dropdown_page_keyboard_test.js b/src/__tests__/casperjs/level_dropdown_page_keyboard_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_dropdown_test.js b/src/__tests__/casperjs/level_dropdown_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_objective_test.js b/src/__tests__/casperjs/level_objective_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_show_goal_test.js b/src/__tests__/casperjs/level_show_goal_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/level_solved_test.js b/src/__tests__/casperjs/level_solved_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/locale_comand_test.js b/src/__tests__/casperjs/locale_comand_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/locale_header_test.js b/src/__tests__/casperjs/locale_header_test.js old mode 100644 new mode 100755 index 09989f88..f2959146 --- a/src/__tests__/casperjs/locale_header_test.js +++ b/src/__tests__/casperjs/locale_header_test.js @@ -31,8 +31,8 @@ casper.start( Object.keys(langLocaleMap).forEach(function(lang) { var locale = langLocaleMap[lang]; this.test.assertEvalEquals(function(lang) { - debug_LocaleActions_changeLocaleFromHeader(lang); - return debug_LocaleStore_getLocale(); + window.LocaleActions.changeLocaleFromHeader(lang); + return window.LocaleStore.getLocale(); }, locale, 'Testing changing store locale from ' + lang + @@ -45,8 +45,8 @@ casper.start( Object.keys(headerLocaleMap).forEach(function(header) { var locale = headerLocaleMap[header]; this.test.assertEvalEquals(function(header) { - debug_LocaleActions_changeLocaleFromHeader(header); - return debug_LocaleStore_getLocale(); + window.LocaleActions.changeLocaleFromHeader(header); + return window.LocaleStore.getLocale(); }, locale, 'Testing changing store locale from ' + header + diff --git a/src/__tests__/casperjs/locale_uri_param_test.js b/src/__tests__/casperjs/locale_uri_param_test.js old mode 100644 new mode 100755 diff --git a/src/__tests__/casperjs/pageload_test.js b/src/__tests__/casperjs/pageload_test.js old mode 100644 new mode 100755 diff --git a/src/js/app/index.js b/src/js/app/index.js index 6fcc1569..ff1ba727 100644 --- a/src/js/app/index.js +++ b/src/js/app/index.js @@ -47,6 +47,10 @@ var init = function() { initRootEvents(eventBaton); initDemo(sandbox); + // unfortunate global export for casper tests + window.LocaleStore = LocaleStore; + window.LocaleActions = LocaleActions; + window.intl = intl; }; var vcsModeRefresh = function(eventData) {