example: commonjs/node based approach

.jshintrc

@@ -22,7 +22,9 @@
         "jQuery",
         "$",
         "describe",
+        "ddescribe",
         "it",
+        "iit",
         "expect",
         "beforeEach",
         "afterEach",

README.md

@@ -2,12 +2,11 @@
 
 Extensions to the Jasmine test framework for use with [Flight](https://github.com/flightjs/flight)
 
-# Getting started
+# Installation
 
-Include [jasmine-flight.js](https://raw.github.com/flightjs/jasmine-flight/master/lib/jasmine-flight.js)
-in your app and load it in your test runner.
-
-Or install it with [Bower](http://bower.io/):
+```bash
+npm install --save-dev jasmine-flight
+```
 
 ```bash
 bower install --save-dev jasmine-flight
@@ -17,16 +16,8 @@ bower install --save-dev jasmine-flight
 [jasmine](https://github.com/pivotal/jasmine) and
 [jasmine-jquery](https://github.com/velesin/jasmine-jquery)
 
-jasmine-flight assumes you'll be using RequireJS to load Flight modules, and
-that you've configured the Flight directory path. For example:
-
-```javascript
-requirejs.config({
-  paths: {
-    flight: 'bower_components/flight'
-  }
-});
-```
+`jasmine-flight` assumes you'll be loading Flight modules with a module loader
+than implements `require`.
 
 ## Components
 

lib/jasmine-flight.js → index.js

@@ -3,9 +3,12 @@
  * Licensed under the MIT License
  */
 
-(function (root) {
+
+(function (root, jasmine) {
   'use strict';
 
+  var flight = require('flightjs');
+
   jasmine.flight = {};
 
   /**
@@ -49,13 +52,9 @@
           this.component = (new this.Component()).initialize(this.$node, options);
         };
 
-        var requireCallback = function (registry, Component) {
-          registry.reset();
-          this.Component = Component;
+        flight.registry.reset();
+        this.Component = require(componentPath);
         done();
-        }.bind(this);
-
-        require(['flight/lib/registry', componentPath], requireCallback);
       });
 
       afterEach(function (done) {
@@ -64,17 +63,14 @@
           this.$node = null;
         }
 
-        var requireCallback = function (defineComponent) {
+
         if (this.component) {
           this.component = null;
         }
 
         this.Component = null;
-          defineComponent.teardownAll();
+        require('flightjs').component.teardownAll();
         done();
-        }.bind(this);
-
-        require(['flight/lib/component'], requireCallback);
       });
 
       specDefinitions.apply(this);
@@ -130,13 +126,9 @@
           this.component = (new this.Component()).initialize(this.$node, options);
         };
 
-        var requireCallback = function (registry, defineComponent, Mixin) {
-          registry.reset();
-          this.Component = defineComponent(function () {}, Mixin);
+        flight.registry.reset();
+        this.Component = flight.component(function () {}, require(mixinPath));
         done();
-        }.bind(this);
-
-        require(['flight/lib/registry', 'flight/lib/component', mixinPath], requireCallback);
       });
 
       afterEach(function (done) {
@@ -145,17 +137,13 @@
           this.$node = null;
         }
 
-        var requireCallback = function (defineComponent) {
         if (this.component) {
           this.component = null;
         }
 
         this.Component = null;
-          defineComponent.teardownAll();
+        flight.component.teardownAll();
         done();
-        }.bind(this);
-
-        require(['flight/lib/component'], requireCallback);
       });
 
       specDefinitions.apply(this);
@@ -186,12 +174,8 @@
       beforeEach(function (done) {
         this.module = null;
 
-        var requireCallback = function (module) {
-          this.module = module;
+        this.module = require(modulePath);
         done();
-        }.bind(this);
-
-        require([modulePath], requireCallback);
       });
 
       specDefinitions.apply(this);
@@ -363,7 +347,7 @@
         pass: wasTriggeredWithData
       };
 
-      result.message = function () {
+      result.message = (function () {
         var $pp = function (obj) {
           var description;
           var attr;
@@ -397,7 +381,7 @@
             'Expected event ' + eventName + ' not to have been triggered on ' + $pp(selector)
           ];
         }
-      }();
+      }());
 
       return result;
 
@@ -415,7 +399,7 @@
               pass: wasTriggered
             };
 
-            result.message = function () {
+            result.message = (function () {
               var $pp = function (obj) {
                 var description;
                 var attr;
@@ -448,7 +432,7 @@
                   'Expected event ' + eventName + ' not to have been triggered on ' + $pp(selector)
                 ];
               }
-            }();
+            }());
 
             return result;
           }
@@ -505,4 +489,4 @@
     jasmine.flight.events.cleanUp();
   });
 
-}(this));
+}(this, this.jasmine));

karma.conf.js

@@ -7,50 +7,49 @@ module.exports = function (config) {
   'use strict';
 
   config.set({
-
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
 
-    // frameworks to use
-    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['jasmine'],
+    frameworks: [
+      'jasmine',
+      'commonjs'
+    ],
+
+    preprocessors: {
+      'index.js': ['commonjs'],
+      'test/**/*.js': ['commonjs'],
+      'node_modules/flightjs/*.js': ['commonjs'],
+      'node_modules/flightjs/lib/*.js': ['commonjs']
+    },
 
     // list of files / patterns to load in the browser
     files: [
-      // es5 shim for PhantomJS & IE8 & below
-      'bower_components/es5-shim/es5-shim.js',
-      'bower_components/es5-shim/es5-sham.js',
-      // hack to load RequireJS after the shim libs
-      'node_modules/requirejs/require.js',
-      'node_modules/karma-requirejs/lib/adapter.js',
-      // jQuery
-      'bower_components/jquery/dist/jquery.js',
+      // jquery
+      'node_modules/flightjs/node_modules/jquery/dist/jquery.js',
       // jasmine-jquery
-      'bower_components/jasmine-jquery/lib/jasmine-jquery.js',
-      // jasmine-flight (what we're actually testing!)
-      'lib/jasmine-flight.js',
+      'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
       // flight
-      {pattern: 'bower_components/flight/**/*.js', included: false},
-      // specs
-      {pattern: 'test/spec/**/*.js', included: false},
-      // mocks
-      {pattern: 'test/mock/**/*.js', included: false},
-      // test runner
-      'test/test-main.js',
+      'node_modules/flightjs/*.js',
+      'node_modules/flightjs/lib/*.js',
+      // library
+      'index.js',
+      // tests
+      'test/mock/**/*.js',
+      'test/spec/**/*.js'
     ],
 
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
-    // start these browsers
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: [
-      'Chrome'
-    ],
+    // Start these browsers
+    // CLI --browsers Chrome, Firefox, Safari
+    browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],
 
+    // use dots reporter, as travis terminal does not support escaping sequences
+    // possible values: 'dots', 'progress'
+    // CLI --reporters progress
+    reporters: [process.env.TRAVIS ? 'dots' : 'progress'],
 
-    // Continuous Integration mode
-    // if true, Karma captures browsers, runs the tests and exits
     singleRun: false
   });
 };

package.json

@@ -1,17 +1,21 @@
 {
   "name": "jasmine-flight",
   "version": "3.0.0",
+  "dependencies": {
+    "flightjs": "git://github.com/flightjs/flight.git#0e390c8900567a4b14f8f81316a7fbab218a7847",
+    "jasmine-jquery": "git://github.com/velesin/jasmine-jquery.git"
+  },
   "devDependencies": {
     "karma": "~0.12.6",
     "karma-cli": "~0.0.4",
     "karma-jasmine": "~0.2.0",
-    "requirejs": "^2.1.14",
-    "karma-requirejs": "~0.2.2",
     "karma-chrome-launcher": "~0.1.4",
-    "karma-firefox-launcher": "~0.1.3"
+    "karma-firefox-launcher": "~0.1.3",
+    "karma-commonjs": "0.0.10"
   },
   "scripts": {
-    "test": "./node_modules/.bin/karma start --browsers Firefox --single-run"
+    "test": "./node_modules/.bin/karma start --single-run",
+    "watch": "./node_modules/.bin/karma start"
   },
   "repository": {
     "type": "git",

test/mock/example.js

@@ -1,13 +1,9 @@
-define(function (require) {
-  'use strict';
+var flight = require('flightjs');
 
-  var defineComponent = require('flight/lib/component');
+module.exports = flight.component(Example);
 
 function Example() {
   this.defaultAttrs({
     param: 'defaultParam'
   });
 }
-
-  return defineComponent(Example);
-});

test/mock/example_mixin.js

@@ -1,7 +1,5 @@
-define(function () {
-    return function Mixin() {
+module.exports = function Mixin() {
   this.defaultAttrs({
     param: 'defaultParam'
   });
-    }
-});
+};

test/spec/describe_component.spec.js

@@ -1,12 +1,7 @@
-/*global describeComponent, setupComponent*/
+var flight = require('flightjs');
+var Example = require('../mock/example');
 
-define(function (require) {
-  'use strict';
-
-  var defineComponent = require('flight/lib/component');
-  var Example = require('mock/example');
-
-  describeComponent('mock/example', function () {
+describeComponent('./test/mock/example', function () {
   describe('this.Component', function () {
     it('should be an Example component', function () {
       expect(this.Component).toEqual(Example);
@@ -29,11 +24,11 @@ define(function (require) {
     });
   });
 
-    describe('defineComponent.teardownAll()', function () {
+  describe('flight.component.teardownAll()', function () {
     var result = [];
 
     beforeEach(function () {
-        spyOn(defineComponent, 'teardownAll').and.callFake(function () {
+      spyOn(flight.component, 'teardownAll').and.callFake(function () {
         result.push('call');
       });
     });
@@ -145,4 +140,3 @@ define(function (require) {
     });
   });
 });
-});

test/spec/describe_mixin.spec.js

@@ -1,17 +1,13 @@
 /*global describeComponent, setupComponent*/
 
-define(function (require) {
-  'use strict';
+var flight = require('flightjs');
 
-  var defineComponent = require('flight/lib/component');
-  var Example = require('mock/example');
-
-  describeMixin('mock/example_mixin', function () {
-    describe('defineComponent.teardownAll()', function () {
+describeMixin('./test/mock/example_mixin', function () {
+  describe('flight.component.teardownAll()', function () {
     var result = [];
 
     beforeEach(function () {
-        spyOn(defineComponent, 'teardownAll').and.callFake(function () {
+      spyOn(flight.component, 'teardownAll').and.callFake(function () {
         result.push('call');
       });
     });
@@ -123,4 +119,3 @@ define(function (require) {
     });
   });
 });
-});

test/spec/spy-on-event.spec.js

@@ -1,8 +1,5 @@
 /*global spyOnEvent*/
 
-define(function (require) {
-  'use strict';
-
 describe('spyOnEvent', function () {
   it('returns a spy', function () {
     var spy = spyOnEvent(document, 'test-event');
@@ -78,4 +75,3 @@ define(function (require) {
     expect(this.spy).toHaveBeenTriggeredOnAndWithFuzzy(document, {test2: null});
   });
 });
-});