Merge pull request #54 from mobify/iframe-test

scalvert · scalvert · commit 6288248d0a0b · 2015-02-11T08:28:07.000-08:00
Iframe test
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+5.0.1
+  - Reworked test infrastructure to use more robust setup and teardown using iframes
 5.0.0
   - Upgrading to latest version of plugin factory
   - Adding `destroy` method
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bellows",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "homepage": "https://github.com/mobify/bellows",
   "authors": [
     "Mobify <jobs@mobify.com>"
diff --git a/circle.yml b/circle.yml
@@ -5,6 +5,7 @@ machine:
 test:
     pre:
         - gem install sass -v 3.4
+        - bower cache clean
         - bower install
     override:
         - grunt lint
diff --git a/dist/bellows.js b/dist/bellows.js
@@ -33,7 +33,7 @@
         Bellows.__super__.call(this, element, options, Bellows.DEFAULTS);
     }
 
-    Bellows.VERSION = '5.1.0';
+    Bellows.VERSION = '5.1.1';
 
     Bellows.DEFAULTS = {
         singleItemOpen: false,
diff --git a/dist/bellows.min.js b/dist/bellows.min.js
diff --git a/package.json b/package.json
@@ -4,15 +4,15 @@
     "type" : "git",
     "url" : "https://github.com/mobify/bellows.git"
   },
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "A mobile first accordion UI plugin",
   "devDependencies": {
     "grunt": "~0.4.x",
     "grunt-contrib-uglify": "~0.1.1",
     "grunt-css": "~0.5.4",
     "grunt-shell": "~0.2.1",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-connect": "~0.3.0",
+    "grunt-contrib-connect": "~0.9.0",
     "grunt-contrib-watch": "~0.5.1",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-autoprefixer": "~2.0.0",
@@ -25,7 +25,8 @@
     "grunt-mocha-phantomjs": "~0.3.2",
     "grunt-open": "^0.2.3",
     "mocha": "~1.14.0",
-    "chai": "~1.9.0"
+    "chai": "~1.9.0",
+    "requirejs-glob": "git+ssh://git@github.com:mobify/requirejs-glob.git"
   },
   "license": "MIT"
 }
diff --git a/tasks/config/connect.js b/tasks/config/connect.js
@@ -1,4 +1,9 @@
 module.exports = function(grunt) {
+    var addRequireJSGlob = function(connect, options, middlewares) {
+        middlewares.unshift(require('requirejs-glob')());
+        return middlewares;
+    };
+
     return {
         server: {
             options: {
@@ -11,7 +16,8 @@ module.exports = function(grunt) {
             options: {
                 hostname: '0.0.0.0',
                 port: 8888,
-                base: '.'
+                base: '.',
+                middleware: addRequireJSGlob
             }
         }
     };
diff --git a/tests/fixtures/sandbox.html b/tests/fixtures/sandbox.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Bellows Tests</title>
+	<link rel="stylesheet" href="../../dist/bellows.min.css"/>
+    <link rel="stylesheet" href="../../dist/bellows-theme.min.css"/>
+</head>
+<body>
+    <div id="container"></div>
+	
+    <script data-main="../runner/sandbox-main" src="../../bower_components/requirejs/require.js"></script>
+</body>
diff --git a/tests/runner/index.html b/tests/runner/index.html
@@ -3,15 +3,12 @@
     <meta charset="utf-8"/>
     <title>Bellows Tests</title>
     <link rel="stylesheet" href="../../node_modules/mocha/mocha.css"/>
-    <link rel="stylesheet" href="../../dist/bellows.min.css"/>
-    <link rel="stylesheet" href="../../dist/bellows-theme.min.css"/>
-
+    
     <script src="../../node_modules/mocha/mocha.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
   </head>
   <body>
     <div id="mocha"></div>
-    <script data-main="main" src="../../bower_components/requirejs/require.js"></script>
-    <div id="container"></div>
+    <script data-main="test-main" src="../../bower_components/requirejs/require.js"></script>
   </body>
 </html>
diff --git a/tests/runner/main.js b/tests/runner/main.js
diff --git a/tests/runner/sandbox-config.js b/tests/runner/sandbox-config.js
@@ -3,11 +3,11 @@ require.config({
     paths: {
         'text': 'bower_components/requirejs-text/text',
         'fixtures': 'tests/fixtures',
-        '$': 'lib/zeptojs/dist/zepto.min',
+        '$': 'lib/zeptojs/dist/zepto',
         'velocity': 'bower_components/mobify-velocity/velocity',
         'chai': 'node_modules/chai/chai',
         'mocha': 'node_modules/mocha/mocha',
-        'plugin': 'bower_components/plugin/dist/plugin.min',
+        'plugin': 'bower_components/plugin/dist/plugin',
         'bellows': 'dist/bellows'
     },
     'shim': {
diff --git a/tests/runner/sandbox-main.js b/tests/runner/sandbox-main.js
@@ -0,0 +1,16 @@
+
+require(['sandbox-config'], function() {
+    require([
+        '$',
+        'velocity',
+        'plugin',
+        'bellows'
+    ],
+        function($) {
+            window.dependencies = {
+                $: $
+            };
+
+            window.parent.postMessage('loaded', '*');
+        });
+});
diff --git a/tests/runner/test-config.js b/tests/runner/test-config.js
@@ -0,0 +1,26 @@
+require.config({
+    baseUrl: '../../',
+    paths: {
+        'text': 'bower_components/requirejs-text/text',
+        'glob': 'node_modules/requirejs-glob/lib/glob',
+        'fixtures': 'tests/fixtures',
+        '$': 'lib/zeptojs/dist/zepto.min',
+        'chai': 'node_modules/chai/chai',
+        'mocha': 'node_modules/mocha/mocha',
+        'test-sandbox': 'tests/utils/test-sandbox'
+    },
+    'shim': {
+        'mocha': {
+            init: function() {
+                this.mocha.setup('bdd');
+                return this.mocha;
+            }
+        },
+        '$': {
+            exports: '$'
+        }
+    },
+    glob: {
+        middlewarePathPrefix: '/'
+    }
+});
diff --git a/tests/runner/test-main.js b/tests/runner/test-main.js
@@ -0,0 +1,17 @@
+require(['test-config'], function() {
+    require([
+            'require',
+            'chai',
+            'mocha'
+        ],
+        function(require, chai, mocha) {
+            require(['glob!tests/unit/*.js'], function() {
+                window.expect = chai.expect;
+
+                if (window.mochaPhantomJS) {
+                    return window.mochaPhantomJS.run();
+                }
+                mocha.run();
+            });
+        });
+});
diff --git a/tests/unit/constructor.js b/tests/unit/constructor.js
@@ -1,24 +1,28 @@
 define([
-    'text!fixtures/bellows.html',
-    '$',
-    'velocity',
-    'bellows'
-], function(fixture, $) {
+    'test-sandbox',
+    'text!fixtures/bellows.html'
+], function(testSandbox, fixture) {
     var Bellows;
     var $element;
+    var $;
 
     describe('Bellows constructor', function() {
-        beforeEach(function() {
-            Bellows = $.fn.bellows.Constructor;
-            $element = $(fixture);
+        beforeEach(function(done) {
+            var setUpComplete = function(iFrame$) {
+                $ = iFrame$;
+                Bellows = $.fn.bellows.Constructor;
+                $element = $(fixture);
+
+                done();
+            };
+
+            testSandbox.setUp('sandbox', setUpComplete);
         });
 
         it('creates a bellows instance', function() {
             var bellows = new Bellows($element);
 
-            assert.isDefined(bellows);
-
-            bellows.destroy();
+            expect(bellows).to.be.defined;
         });
     });
 });
diff --git a/tests/unit/events.js b/tests/unit/events.js
@@ -1,12 +1,12 @@
 define([
-    'text!fixtures/bellows.html',
-    '$',
-    'velocity',
-    'bellows'
-], function(fixture, $) {
+    'test-sandbox',
+    'text!fixtures/bellows.html'
+], function(testSandbox, fixture) {
+    var Bellows;
     var $element;
+    var $;
 
-    describe('Bellows events', function() {
+    describe('Bellows constructor', function() {
         var stringify = JSON.stringify;
 
         before(function() {
@@ -27,12 +27,16 @@ define([
             JSON.stringify = stringify;
         });
 
-        beforeEach(function() {
-            $element = $(fixture).appendTo('#container');
-        });
+        beforeEach(function(done) {
+            var setUpComplete = function(iFrame$) {
+                $ = iFrame$;
+                Bellows = $.fn.bellows.Constructor;
+                $element = $(fixture).appendTo('#container');
+
+                done();
+            };
 
-        afterEach(function() {
-            $element.bellows('destroy');
+            testSandbox.setUp('sandbox', setUpComplete);
         });
 
         it('fires the open event when the header is clicked', function(done) {
diff --git a/tests/unit/options.js b/tests/unit/options.js
diff --git a/tests/unit/plugin.js b/tests/unit/plugin.js
diff --git a/tests/utils/test-sandbox.js b/tests/utils/test-sandbox.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+5.0.1`
	`2`	`+ - Reworked test infrastructure to use more robust setup and teardown using iframes`
`1`	`3`	`5.0.0`
`2`	`4`	`- Upgrading to latest version of plugin factory`
`3`	`5`	- Adding `destroy` method
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bellows",`
`3`		`- "version": "5.1.0",`
	`3`	`+ "version": "5.1.1",`
`4`	`4`	`"homepage": "https://github.com/mobify/bellows",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Mobify <jobs@mobify.com>"`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`Bellows.__super__.call(this, element, options, Bellows.DEFAULTS);`
`34`	`34`	`}`
`35`	`35`
`36`		`- Bellows.VERSION = '5.1.0';`
	`36`	`+ Bellows.VERSION = '5.1.1';`
`37`	`37`
`38`	`38`	`Bellows.DEFAULTS = {`
`39`	`39`	`singleItemOpen: false,`