Skip to content
This repository was archived by the owner on Jul 13, 2020. It is now read-only.

Commit 0793f80

Browse files
committed
test adjustments for ie
1 parent ad8c9c7 commit 0793f80

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ before_install:
1515
script:
1616
- grunt
1717
- npm test
18-
- npm run test:browser-traceur -- --polyfill
19-
- npm run test:browser-6to5 -- --polyfill
18+
- npm run test:browser-traceur
19+
- npm run test:browser-6to5
2020
- npm run test:browser-traceur -- --saucelabs
2121
- npm run test:browser-6to5 -- --saucelabs
2222
- npm run test:browser-traceur -- --saucelabs --ie8

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ Dynamically loads ES6 modules in browsers and [NodeJS](#nodejs-use) with support
55
This project implements dynamic module loading through `System` exactly to the previous ES6-specified loader API at [2014-08-24 ES6 Specification Draft Rev 27, Section 15](http://wiki.ecmascript.org/doku.php?id=harmony:specification_drafts#august_24_2014_draft_rev_27) and will continue to track this API as it is re-drafted as a browser specification (currently most likely to be at https://github.com/whatwg/loader).
66

77
* Provides an asynchronous loader (`System.import`) to [dynamically load ES6 modules](##getting-started).
8-
* Uses [Traceur](https://github.com/google/traceur-compiler) for compiling ES6 modules and syntax into ES5 in the browser with source map support.
8+
* Supports both [Traceur](https://github.com/google/traceur-compiler) and [6to5](https://6to5.org/) for compiling ES6 modules and syntax into ES5 in the browser with source map support.
99
* Fully supports [ES6 circular references and live bindings](https://github.com/ModuleLoader/es6-module-loader/wiki/Circular-References-&-Bindings).
1010
* Includes [`baseURL` and `paths` implementations](https://github.com/ModuleLoader/es6-module-loader/wiki/Configuring-the-Loader).
1111
* Can be used as a [tracing tool](https://github.com/ModuleLoader/es6-module-loader/wiki/Tracing-API) for static analysis of modules.
1212
* Polyfills ES6 Promises in the browser with an optionally bundled ES6 promise implementation.
13-
* Supports ES6 module loading in IE8+. Other ES6 features only supported by Traceur in IE9+.
13+
* Supports IE8+, with IE9+ support for ES6 development without pre-compilation.
1414
* The complete combined polyfill, including ES6 promises, comes to 9KB minified and gzipped, making it suitable for production use, provided that modules are [built into ES5 making them independent of Traceur](https://github.com/ModuleLoader/es6-module-loader/wiki/Production-Workflows).
1515

1616
For an overview of build workflows, [see the production guide](https://github.com/ModuleLoader/es6-module-loader/wiki/Production-Workflows).
1717

1818
For an example of a universal module loader based on this polyfill for loading AMD, CommonJS and globals, see [SystemJS](https://github.com/systemjs/systemjs).
1919

20-
_The current version is tested against **[Traceur 0.0.79](https://github.com/google/traceur-compiler/tree/0.0.79)**._
21-
2220
### Documentation
2321

2422
* [A brief overview of ES6 module syntax](https://github.com/ModuleLoader/es6-module-loader/wiki/Brief-Overview-of-ES6-Module-syntax)
@@ -30,9 +28,7 @@ _The current version is tested against **[Traceur 0.0.79](https://github.com/goo
3028

3129
### Getting Started
3230

33-
Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.11.0/dist/es6-module-loader.js) and traceur.js into the same folder.
34-
35-
If using ES6 syntax (optional), include [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.79/traceur.js) in the page first then include `es6-module-loader.js`:
31+
If using ES6 syntax (optional), include `traceur.js` in the page first then include `es6-module-loader.js`:
3632

3733
```html
3834
<script src="traceur.js"></script>

karma.conf.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ if (options.ie8) {
2525
console.log('IE8 Mode !\n - polyfill required\n');
2626
options.polyfill = true;
2727
}
28+
if (options.saucelabs) {
29+
options.polyfill = true;
30+
}
2831

2932
////
3033

test/custom-loader.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
//
22

3+
var ie = typeof window != 'undefined' && window.navigator.userAgent.match(/Trident/);
4+
35
describe('Custom Loader', function () {
46

57
describe('#import', function () {
68

79
describe('scripts', function () {
8-
it('should support ES6 scripts', function (done) {
10+
(ie ? it.skip : it)('should support ES6 scripts', function (done) {
911
customLoader.import('test/loader/test')
1012
.then(function (m) {
1113
expect(m.loader).to.be.equal('custom');
1214
})
1315
.then(done, done)
1416
});
1517

16-
it('should support AMD scripts', function (done) {
18+
(ie ? it.skip : it)('should support AMD scripts', function (done) {
1719
customLoader.import('test/loader/amd')
1820
.then(function (m) {
1921
expect(m.format).to.be.equal('amd');

test/system.spec.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
if (typeof to5 != 'undefined')
44
System.parser = '6to5';
55

6+
var ie = typeof window != 'undefined' && window.navigator.userAgent.match(/Trident/);
7+
68
describe('System', function () {
79

810
var originBaseUrl = System.baseURL;
@@ -377,7 +379,7 @@ describe('System', function () {
377379
describeIf(
378380
typeof window != 'undefined' && window.Worker,
379381
'with Web Worker', function () {
380-
it('should loading inside of a Web Worker', function (done) {
382+
(ie ? it.skip : it)('should loading inside of a Web Worker', function (done) {
381383
var worker = new Worker(System.baseURL + 'test/worker/worker-' + System.parser + '.js');
382384

383385
worker.onmessage = function (e) {

0 commit comments

Comments
 (0)