Skip to content

Commit

Permalink
fixed bug in IE11 and setup saucelabs for future test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
eclifford committed Aug 1, 2014
1 parent 77506cf commit 76384f9
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 20 deletions.
33 changes: 33 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,39 @@ module.exports = function(grunt) {
background: false,
singleRun: true,
browsers: ['PhantomJS']
},
ci: {
sauceLabs: {
testName: 'Bronson Unit Tests'
},
singleRun: true,
customLaunchers: {
sl_chrome: {
base: 'SauceLabs',
browserName: 'chrome',
platform: 'Windows 7',
version: '35'
},
sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox',
version: '30'
},
sl_ios_safari: {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.9',
version: '7.1'
},
sl_ie_11: {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
}
},
browsers: ['sl_chrome', 'sl_firefox', 'sl_ie_11'],
reporters: ['dots', 'saucelabs']
}
},
bump: {
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bronsonjs",
"version": "2.0.13",
"version": "2.0.14",
"description": "AMD module framework for building large scale javascript applications",
"homepage": "https://github.com/eclifford/bronson",
"authors": [
Expand Down
4 changes: 2 additions & 2 deletions bronson.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'use strict';

var Bronson = {
version: '2.0.13',
version: '2.0.14',

settings: {
options: {
Expand Down Expand Up @@ -443,7 +443,7 @@
continue;

var isObj = typeof source === 'object',
isArray = toString.call(source) == '[object Array]';
isArray = Object.prototype.toString.call(source) == '[object Array]';

if(isArray) {
dest = dest || [];
Expand Down
2 changes: 1 addition & 1 deletion bronson.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "bronsonjs",
"version": "2.0.13",
"version": "2.0.14",
"description": "AMD module framework for building large scale javascript applications",
"main": "bronson.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "grunt karma:single"
"test": "grunt karma:ci"
},
"repository": {
"url": "[email protected]:eclifford/bronson.git"
Expand All @@ -19,24 +19,25 @@
},
"devDependencies": {
"grunt": "~0.4.5",
"karma-chrome-launcher": "*",
"karma-firefox-launcher": "*",
"karma-requirejs": "*",
"karma-phantomjs-launcher": "*",
"karma": "*",
"karma-sinon-chai": "*",
"karma-chai-jquery": "*",
"load-grunt-tasks": "*",
"grunt-karma": "*",
"karma-mocha": "*",
"karma-chai": "*",
"grunt-contrib-uglify": "*",
"grunt-bump": "*",
"grunt-contrib-copy": "*",
"grunt-contrib-jshint": "*",
"grunt-contrib-uglify": "*",
"grunt-contrib-watch": "*",
"grunt-karma": "*",
"grunt-release": "*",
"grunt-bump": "*",
"grunt-text-replace": "*",
"grunt-contrib-copy": "*"
"karma": "*",
"karma-chai": "*",
"karma-chai-jquery": "*",
"karma-chrome-launcher": "*",
"karma-firefox-launcher": "*",
"karma-mocha": "*",
"karma-phantomjs-launcher": "*",
"karma-requirejs": "*",
"karma-sauce-launcher": "^0.2.10",
"karma-sinon-chai": "*",
"load-grunt-tasks": "*"
},
"dependencies": {
"karma-jquery": "^0.1.0"
Expand Down

0 comments on commit 76384f9

Please sign in to comment.