karma-laxar
Advanced tools
Comparing version 1.0.0 to 1.1.0-alpha.0
@@ -6,6 +6,11 @@ # Changelog | ||
## v1.1.0-alpha.0 | ||
- [#3](https://github.com/LaxarJS/karma-laxar/issues/3): made compatible with laxar-testing and jasmine 2.x | ||
## v1.0.0 | ||
## v0.2.0 | ||
- [#2](https://github.com/LaxarJS/grunt-laxar/issues/2): documentation: fixed URL in README.md | ||
- [#1](https://github.com/LaxarJS/grunt-laxar/issues/1): automatically load es5-shim | ||
- [#2](https://github.com/LaxarJS/karma-laxar/issues/2): documentation: fixed URL in README.md | ||
- [#1](https://github.com/LaxarJS/karma-laxar/issues/1): automatically load es5-shim |
@@ -1,2 +0,2 @@ | ||
( function( karma, requirejs, jasmine, laxarSpec, locationPathname ) { | ||
( function( karma, requirejs, jasmineRequireOrJasmine, laxarSpec, locationPathname ) { | ||
@@ -403,14 +403,41 @@ | ||
/*global Jasmine1KarmaReporter, Jasmine2KarmaReporter*/ | ||
function createStartFn( karma, requirejs, jasmine, laxarSpec ) { | ||
function createStartFn( karma, requirejs, jasmineRequireOrJasmine, laxarSpec ) { | ||
'use strict'; | ||
var jasmineEnv = jasmine.getEnv(); | ||
if( jasmine.version_.major === 1 ) { | ||
jasmineEnv.addReporter( new Jasmine1KarmaReporter( karma, jasmineEnv ) ); | ||
} | ||
else { | ||
var jasmine; | ||
var jasmineEnv; | ||
if( typeof jasmineRequireOrJasmine.version === 'function' && | ||
jasmineRequireOrJasmine.version().indexOf( '2.' ) === 0 ) { | ||
// We have jasmine version 2.x.x and thus assume widget tests running with LaxarJS/laxar-testing | ||
// instead of the old LaxarJs/laxar/laxar_testing. | ||
var jasmineRequire = jasmineRequireOrJasmine; | ||
// We need to expose jasmine on the global object for angular-mocks | ||
jasmine = window.jasmine = jasmineRequire.core( jasmineRequire ); | ||
jasmineEnv = jasmine.getEnv(); | ||
jasmineEnv.addReporter( new Jasmine2KarmaReporter( karma, jasmineEnv ) ); | ||
var jasmineInterface = jasmineRequire.interface(jasmine, jasmineEnv); | ||
for( var property in jasmineInterface ) { | ||
if( jasmineInterface.hasOwnProperty( property ) ) { | ||
window[property] = jasmineInterface[property]; | ||
} | ||
} | ||
return function() { | ||
requirejs.config( laxarSpec.requireConfig ); | ||
requirejs( [ | ||
'laxar-testing' | ||
], function( testing ) { | ||
testing.runSpec( laxarSpec, jasmineEnv ); | ||
} ); | ||
}; | ||
} | ||
jasmine = window.jasmine = jasmineRequireOrJasmine; | ||
// We have jasmine version 1.x.x and hence assume old style laxar_testing | ||
jasmineEnv = jasmine.getEnv(); | ||
jasmineEnv.addReporter( new Jasmine1KarmaReporter( karma, jasmineEnv ) ); | ||
return function() { | ||
@@ -427,4 +454,4 @@ requirejs.config( laxarSpec.requireConfig ); | ||
requirejs.load = createPatchedLoad( karma.files, requirejs.load, locationPathname ); | ||
karma.start = createStartFn( karma, requirejs, jasmine, laxarSpec ); | ||
karma.start = createStartFn( karma, requirejs, jasmineRequireOrJasmine, laxarSpec ); | ||
} )( window.__karma__, window.requirejs, window.jasmine, window.laxarSpec, window.location.pathname ); | ||
} )( window.__karma__, window.requirejs, window.jasmineRequire || window.jasmine, window.laxarSpec, window.location.pathname ); |
@@ -68,6 +68,6 @@ /** | ||
require.resolve( 'es5-shim' ), | ||
__dirname + '/adapter_pre.min.js', | ||
__dirname + '/adapter_pre.js', | ||
path.resolve( path.join( baseUrl, rconfig.paths.jasmine ) ) + '.js', | ||
path.resolve( path.join( baseUrl, rconfig.paths.requirejs ) ) + '.js', | ||
__dirname + '/adapter_post.min.js' | ||
__dirname + '/adapter_post.js' | ||
].map( createPattern ) ); | ||
@@ -74,0 +74,0 @@ } |
{ | ||
"name": "karma-laxar", | ||
"version": "1.0.0", | ||
"version": "1.1.0-alpha.0", | ||
"description": "Run LaxarJS specs without the hassle", | ||
@@ -34,5 +34,4 @@ "repository": { | ||
"grunt-auto-release": "~0.0.6", | ||
"grunt-contrib-concat": "~0.4.0", | ||
"grunt-contrib-uglify": "~0.4.0" | ||
"grunt-contrib-concat": "~0.4.0" | ||
} | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
7
450
19322
8
2