diff --git a/Gruntfile.js b/Gruntfile.js index bae0c888..326ff769 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -126,6 +126,10 @@ module.exports = function(grunt) { latedef: false, // use this in mocks forin: false, + // This gets annoying + globalstrict: false, + // for use strict warnings + node: true, /////////////////////////////// // All others are true ////////////////////////////// diff --git a/src/__tests__/casperjs/locale_header_test.js b/src/__tests__/casperjs/locale_header_test.js new file mode 100644 index 00000000..c7dc9717 --- /dev/null +++ b/src/__tests__/casperjs/locale_header_test.js @@ -0,0 +1,31 @@ +var CasperUtils = require('./casperUtils').CasperUtils; + +casper.start( + CasperUtils.getUrl(), + function() { + this.test.assertTitle('Learn Git Branching'); + + casper.waitFor(CasperUtils.waits.jsMount) + .then(CasperUtils.multiAssert( + CasperUtils.asserts.visibleIDs([ + 'commandLineHistory', + 'terminal', + 'interfaceWrapper', + 'mainVisSpace', + 'commandLineBar' + ]), + CasperUtils.asserts.visibleSelectors([ + 'div.visBackgroundColor', + 'p.commandLine' + ]) + )) + + .waitFor(CasperUtils.waits.allCommandsFinished) + + .then( + CasperUtils.asserts.visibleSelectors(['p.finished']) + ) + + .then(CasperUtils.testDone); + +}).run(); diff --git a/src/js/actions/LocaleActions.js b/src/js/actions/LocaleActions.js index c357b481..282bbcba 100644 --- a/src/js/actions/LocaleActions.js +++ b/src/js/actions/LocaleActions.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; var AppConstants = require('../constants/AppConstants'); var AppDispatcher = require('../dispatcher/AppDispatcher'); @@ -8,7 +8,6 @@ var ActionTypes = AppConstants.ActionTypes; var LocaleActions = { changeLocale: function(newLocale) { - console.log('firingt his off', newLocale); AppDispatcher.handleViewAction({ type: ActionTypes.CHANGE_LOCALE, locale: newLocale diff --git a/src/js/app/index.js b/src/js/app/index.js index f1c773d2..d7559128 100644 --- a/src/js/app/index.js +++ b/src/js/app/index.js @@ -311,6 +311,8 @@ function CommandUI() { }); } +exports.changeLocaleFromHeaders = changeLocaleFromHeaders; + exports.getEvents = function() { return events; }; diff --git a/src/js/constants/AppConstants.js b/src/js/constants/AppConstants.js index e097ccc8..2604c0af 100644 --- a/src/js/constants/AppConstants.js +++ b/src/js/constants/AppConstants.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; var keyMirror = require('react/lib/keyMirror'); diff --git a/src/js/intl/index.js b/src/js/intl/index.js index 44e9de46..489b3916 100644 --- a/src/js/intl/index.js +++ b/src/js/intl/index.js @@ -105,20 +105,20 @@ exports.todo = function(str) { return str; }; -var getDialog = exports.getDialog = function(obj) { +exports.getDialog = function(obj) { var defaultLocale = getDefaultLocale(); return getIntlKey(obj, 'dialog') || obj.dialog[defaultLocale]; }; -var getHint = exports.getHint = function(level) { +exports.getHint = function(level) { return getIntlKey(level, 'hint') || str('error-untranslated'); }; -var getName = exports.getName = function(level) { +exports.getName = function(level) { return getIntlKey(level, 'name') || str('error-untranslated'); }; -var getStartDialog = exports.getStartDialog = function(level) { +exports.getStartDialog = function(level) { var startDialog = getIntlKey(level, 'startDialog'); if (startDialog) { return startDialog; } @@ -137,5 +137,3 @@ var getStartDialog = exports.getStartDialog = function(level) { return startCopy; }; - - diff --git a/src/js/stores/LocaleStore.js b/src/js/stores/LocaleStore.js index 6b15a2af..4a2d0567 100644 --- a/src/js/stores/LocaleStore.js +++ b/src/js/stores/LocaleStore.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; var AppConstants = require('../constants/AppConstants'); var AppDispatcher = require('../dispatcher/AppDispatcher'); diff --git a/src/js/util/debug.js b/src/js/util/debug.js index 3f46906b..f649efb1 100644 --- a/src/js/util/debug.js +++ b/src/js/util/debug.js @@ -1,6 +1,7 @@ var _ = require('underscore'); var toGlobalize = { + App: require('../app/index.js'), Tree: require('../visuals/tree'), Visuals: require('../visuals'), Git: require('../git'),