Skip to content

Commit

Permalink
Use my own fork of Karma.
Browse files Browse the repository at this point in the history
It adds the ability to specify in file patterns whether the matching files should be considered binary files.  I'll open a Karma pull request with this soon because it fixes karma-runner/karma#1070.
  • Loading branch information
kring committed Jan 5, 2015
1 parent ec662b9 commit 87c304b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Specs/karma-spec-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ require(['./ThirdParty/when'], function(when) {
* Load the modules via AMD, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment.
*/
var modules = ['Specs/addDefaultMatchers-2.1', 'Specs/equalsMethodEqualityTester-2.1'].concat(specs);
//var modules = ['Specs/addDefaultMatchers-2.1', 'Specs/equalsMethodEqualityTester-2.1', 'Specs/Scene/GlobeSpec'];
//var modules = ['Specs/addDefaultMatchers-2.1', 'Specs/equalsMethodEqualityTester-2.1', 'Specs/Core/CesiumTerrainProviderSpec'];
require(modules, function(addDefaultMatchers, equalsMethodEqualityTester) {
//jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000;
//htmlReporter.initialize();
Expand Down
8 changes: 4 additions & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ module.exports = function(config) {
'Specs/karma-spec-main.js',
{pattern: 'Source/**/*.js', included: false},
{pattern: 'Specs/**/*.js', included: false},
{pattern: 'Specs/Data/**', included: false},
{pattern: 'Source/Assets/**', included: false}
{pattern: 'Specs/Data/**', included: false, isBinary: true},
{pattern: 'Source/Assets/**', included: false, isBinary: true}
],

proxies: {
'/Data': 'http://localhost:8080/Specs/Data'
'/Data': '/base/Specs/Data'
},

// list of files to exclude
Expand Down Expand Up @@ -67,6 +67,6 @@ module.exports = function(config) {

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false
singleRun: true
});
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"express": "4.4.4",
"jasmine-core": "^2.1.3",
"jsdoc": "3.3.0-alpha9",
"karma": "^0.12.30",
"karma": "kring/karma#filePatternBinary",
"karma-chrome-launcher": "^0.1.7",
"karma-firefox-launcher": "^0.1.4",
"karma-ie-launcher": "^0.1.5",
Expand Down

0 comments on commit 87c304b

Please sign in to comment.