jasminewd2 - npm Package Compare versions

Comparing version 0.0.2 to 0.0.3

index.js

		@@ -78,4 +78,3 @@ /**
		// deferred object for signaling completion of asychronous function within globalFn
		var asyncFnDone = webdriver.promise.defer(),
		originalFail = jasmine.getEnv().fail;
		var asyncFnDone = webdriver.promise.defer();

		@@ -90,5 +89,6 @@ if (fn.length === 0) {
		// reject async done promise
		jasmine.getEnv().fail = asyncFnDone.fulfill.fail = function(userError) {
		asyncFnDone.fulfill.fail = function(userError) {
		asyncFnDone.reject(new Error(userError));
		};

		}
		@@ -98,9 +98,7 @@
		fn.call(jasmine.getEnv(), asyncFnDone.fulfill);
		});
		}, 'Run ' + fnName + ' in control flow');

		webdriver.promise.all([asyncFnDone, flowFinished]).then(function() {
		jasmine.getEnv().fail = originalFail;
		seal(done)();
		}, function(e) {
		jasmine.getEnv().fail = originalFail;
		e.stack = e.stack + '\n==== async task ====\n' + driverError.stack;
		@@ -177,3 +175,3 @@ done.fail(e);
		});
		});
		}, 'Expect ' + name);

		@@ -265,8 +263,3 @@ function compare(actual, expected) {
		console.warn('A Jasmine spec timed out. Resetting the WebDriver Control Flow.');
		console.warn('The last active task was: ');
		console.warn(
		(flow.activeFrame_ && flow.activeFrame_.getPendingTask() ?
		flow.activeFrame_.getPendingTask().toString() :
		'unknown'));
		flow.reset();
		}));

package.json

README.md

		@@ -6,3 +6,7 @@ jasminewd [![Build Status](https://travis-ci.org/angular/jasminewd.png?branch=master)](https://travis-ci.org/angular/jasminewd)

		Important: There are two active branches of jasminewd.

		- [master](https://github.com/angular/jasminewd/tree/master) is an adapter for Jasmine 1.3, and uses the package minijasminenode. It is published to npm as `jasminewd`.
		- [jasminewd2](https://github.com/angular/jasminewd/tree/jasminewd2) is an adapter for Jasmine 2.x, and uses the package jasmine. It is published to npm as `jasminewd2`.

		Features
		@@ -9,0 +13,0 @@ --------

New alerts