diff --git a/Gruntfile.js b/Gruntfile.js index da3a6d9..31923a4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -34,11 +34,21 @@ module.exports = function (grunt) { singleRun: true, browsers: ["Chrome", "PhantomJS"] }, + "local-min": { + configFile: "karma.conf.js", + singleRun: true, + browsers: ["Chrome", "PhantomJS"] + }, travis: { configFile: "karma.conf.js", singleRun: true, browsers: travisBrowsers }, + "travis-min": { + configFile: "karma.conf.min.js", + singleRun: true, + browsers: travisBrowsers + }, watch: { autoWatch: true, configFile: "karma.conf.js", @@ -77,8 +87,10 @@ module.exports = function (grunt) { grunt.registerTask('default', ['typescript']); - grunt.registerTask('build', ['typescript:base', 'uglify:base']); + grunt.registerTask('build', ['build:base']); + grunt.registerTask('build:base', ['typescript:base', 'uglify:base']); - grunt.registerTask('test', ['typescript', 'karma:phantom', 'karma:chrome']); - grunt.registerTask('test:travis', ['typescript', 'karma:travis']); + grunt.registerTask('test', ['karma:local']); + grunt.registerTask('test:local', ['karma:local','karma:local']); + grunt.registerTask('test:travis', ['build:base', 'karma:travis', 'karma:travis-min']); }; \ No newline at end of file diff --git a/bower.json b/bower.json index 27dc5db..24805e3 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Typertext", - "version": "0.4.0", + "version": "0.4.1", "homepage": "https://github.com/terribleplan/Typertext", "authors": [ "Kegan Myers " diff --git a/karma.conf.min.js b/karma.conf.min.js new file mode 100644 index 0000000..ac0a7b1 --- /dev/null +++ b/karma.conf.min.js @@ -0,0 +1,46 @@ +module.exports = function (config) { + var sauceConf = { + linux: {opera: {low: 12, high: 12}, googlechrome: {low: 26, high: 32}, firefox: {low: 3, high: 27}}, + "OS X 10.9": {googlechrome: {low: 31, high: 31}, firefox: {low: 4, high: 26}}, + "OS X 10.8": {googlechrome: {low: 27, high: 32}, safari: {low: 6, high: 6}}, + "OS X 10.6": {googlechrome: {low: 27, high: 32}, safari: {low: 5, high: 5}, firefox: {low: 3, high: 27}}, + "Windows XP": {googlechrome: {low: 26, high: 32}, safari: {low: 3, high: 5}, opera: {low: 9, high: 12}, firefox: {low: 4, high: 27}}, + "Windows 7": {googlechrome: {low: 26, high: 32}, safari: {low: 5, high: 5}, opera: {low: 9, high: 12}, firefox: {low: 4, high: 27}}, + "Windows 8": {googlechrome: {low: 26, high: 32}, opera: {low: 9, high: 10}, firefox: {low: 4, high: 27}}, + "Windows 8.1": {googlechrome: {low: 26, high: 32}, opera: {low: 9, high: 10}, firefox: {low: 4, high: 27}} + }; + + var sauceBrowsers = {}; + for (var operatingSystem in sauceConf) { + for (var browser in sauceConf[operatingSystem]) { + for (var i = sauceConf[operatingSystem][browser].low; i < sauceConf[operatingSystem][browser].high; i++) { + sauceBrowsers[(operatingSystem + "_" + browser + "_" + i).toLowerCase().replace(" ", "-")] = { + base: "SauceLabs", + browserName: browser, + platform: operatingSystem, + version: "" + i + } + } + } + } + config.set({ + sauceLabs: { + startConnect: true, + testName: 'TypertextTests', + recordScreenshots: false + }, + basePath: __dirname, + frameworks: ['jasmine'], + files: [ + 'test/**/*.test.js', + 'build/typertext.min.js' + ], + plugins: [ + 'karma-jasmine', + "karma-phantomjs-launcher", + 'karma-sauce-launcher', + 'karma-chrome-launcher' + ], + customLaunchers: sauceBrowsers + }); +}; \ No newline at end of file diff --git a/package.json b/package.json index 8cd7563..dddc69a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "git", "url": "https://github.com/terribleplan/Typertext.git" }, - "version": "0.4.0", + "version": "0.4.1", "devDependencies": { "grunt": "~0.4.2", "grunt-cli": "~0.1.13",