Merge branch 'master' into greenkeeper/initial

Author: andrejewski

.gitignore

@@ -10,4 +10,7 @@ guides/
 !doc/guides/
 site/node_modules/
 !site/lib/
-!site/**/lib/
+!site/**/lib/
+.idea/
+static
+index.html

Makefile

@@ -9,11 +9,11 @@ publish-docs:
 	./node_modules/.bin/documentjs --f
 	git add -f docs/
 	git add -f guides/
-	git add -f site/
+	git add -f site/static/
 	git add -f examples/
 	git add -f index.html
 	git add -f CNAME
 	git commit -m "Publish docs"
 	git push -f origin gh-pages
 	git checkout -
-	git branch -D gh-pages
+	git branch -D gh-pages

browser/adapters/adapters.js

@@ -1,6 +1,7 @@
 var jasmineAdapter = require("funcunit/browser/adapters/jasmine");
 var jasmine2Adapter = require("funcunit/browser/adapters/jasmine2");
 var qunitAdapter = require("funcunit/browser/adapters/qunit");
+var qunit2Adapter = require("funcunit/browser/adapters/qunit2");
 var mochaAdapter = require("funcunit/browser/adapters/mocha");
 var FuncUnit = require("funcunit/browser/core");
 
@@ -68,6 +69,8 @@ FuncUnit.attach = function(runner){
 	var unit;
 	if(isQUnit(runner)) {
 		unit = qunitAdapter(runner);
+	} else if(isQUnit2(runner)) {
+		unit = qunit2Adapter(runner);
 	} else if(isMocha(runner)) {
 		unit = mochaAdapter(runner);
 	} else if(isJasmine(runner)) {
@@ -85,6 +88,10 @@ function isQUnit(runner) {
 	return !!(runner.ok && runner.start && runner.stop);
 }
 
+function isQUnit2(runner) {
+	return !!(runner.assert && runner.assert.ok && runner.assert.async);
+}
+
 function isMocha(runner) {
 	return !!(runner.setup && runner.globals && runner.reporter);
 }

browser/adapters/qunit2.js

@@ -0,0 +1,20 @@
+var FuncUnit = require("funcunit/browser/core");
+
+module.exports = function(QUnit){
+	var done;
+
+	return {
+		pauseTest:function(){
+			done = FuncUnit.qunit2Assert.async();
+		},
+		resumeTest: function(){
+			done();
+		},
+		assertOK: function(assertion, message){
+			FuncUnit.qunit2Assert.ok(assertion, message)
+		},
+		equiv: function(expected, actual){
+			return QUnit.equiv(expected, actual);
+		}
+	};
+};

browser/core.js

@@ -22,6 +22,9 @@ FuncUnit = function( selector, frame ) {
   }
 
   isSyncOnly = typeof forceSync === "boolean"? forceSync: isSyncOnly;
+
+  assignQunit2Assert(FuncUnit);
+
   // if its a function, just run it in the queue
   if(typeof selector == "function"){
     return FuncUnit.wait(0, selector);
@@ -39,8 +42,6 @@ FuncUnit = function( selector, frame ) {
   }
 }
 
-
-
 var getContext = function(context){
     if (typeof context === "number" || typeof context === "string") {
       // try to get the context from an iframe in the funcunit document
@@ -79,6 +80,14 @@ var getContext = function(context){
     return obj;
   }
 
+var assignQunit2Assert = function (func) {
+	var callerFirstArgument = func.caller.arguments[0];
+
+	if(callerFirstArgument && callerFirstArgument.test){
+		FuncUnit.qunit2Assert = callerFirstArgument;
+	}
+};
+
 oldFuncUnit.jQuery.extend(FuncUnit, oldFuncUnit, origFuncUnit)
 FuncUnit.prototype = origFuncUnit.prototype;
 module.exports = FuncUnit;

browser/init.js

@@ -1,7 +1,6 @@
 var jQuery = require("funcunit/browser/jquery");
 
 var FuncUnit = window.FuncUnit || {};
-window.jQuery = jQuery;
 
 jQuery.sub = function() {
   function jQuerySub( selector, context ) {

browser/waits.js

@@ -23,6 +23,7 @@ FuncUnit.
  * 		but before any more queued actions.
  */
 wait = function(time, success){
+	assignQunit2Assert(FuncUnit.wait);
 	if(typeof time == 'function'){
 		success = time;
 		time = undefined;
@@ -68,6 +69,7 @@ FuncUnit.
  * @param {Number} timeout if neither checker returns true before this timeout, the test fails
  */
 branch = function(check1, success1, check2, success2, timeout){
+	assignQunit2Assert(FuncUnit.branch);
 	FuncUnit.repeat({
 		method : function(print){
 			print("Running a branch statement")
@@ -99,7 +101,7 @@ branch = function(check1, success1, check2, success2, timeout){
 	bind: this
  */
 FuncUnit.repeat = function(options){
-	
+	assignQunit2Assert(FuncUnit.repeat);
 	var interval,
 		stopped = false	,
 		stop = function(){
@@ -155,13 +157,22 @@ FuncUnit.repeat = function(options){
  * if the tested page has jQuery present.
  */
 FuncUnit.animationEnd = function(){
+	assignQunit2Assert(FuncUnit.animationEnd);
 F("body").wait(200).size(function(){
 		return F.win.$(':animated').length === 0;
 	});
 };
 
 FuncUnit.animationsDone = FuncUnit.animationEnd;
 
+var assignQunit2Assert = function (func) {
+	var callerFirstArgument = func.caller.arguments[0];
+
+	if(callerFirstArgument && callerFirstArgument.test){
+		FuncUnit.qunit2Assert = callerFirstArgument;
+	}
+};
+
 $.extend(FuncUnit.prototype, {
 	/**
      * @function FuncUnit.prototype.exists .exists()

build.js

@@ -5,13 +5,14 @@ var parseModuleName = npmUtils.moduleName.parse;
 
 stealTools.export({
 	system: {
-		config: __dirname + "/package.json!npm"
+		config: __dirname + "/package.json!npm",
+		"main": "global"
 	},
 	outputs: {
 		"+amd": {},
 		"+cjs": {},
 		"global": {
-			modules: ["funcunit"],
+			modules: ["global"],
 			dest: __dirname + "/dist/funcunit.js",
 			format: "global",
 			normalize: function(depName) {

documentjs.json

@@ -15,10 +15,16 @@
 			},
 			"parent": "Guides",
 			"pageConfig": {"page":"guides"}
+		},
+		"funcunit": {
+			"glob": {
+				"pattern": "funcunit.md"
+			},
+			"templates": "main"
 		}
 	},
 	"siteDefaults": {
 		"static":"site/theme/static",
 		"templates": "site/theme/templates"
 	}
-}
+}

funcunit.md

@@ -0,0 +1,3 @@
+@page funcunit FuncUnit
+
+@body