fix: Legacy modules tests not passing · Urigo/angular-meteor@504952e · GitHub

Urigo / angular-meteor Public

• Notifications You must be signed in to change notification settings
• Fork 603
• Star 2.3k

• Code
• Issues 23
• Pull requests 2
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 504952e

Browse filesBrowse the repository at this point in the historyBrowse files

DAB0mB

committed

fix: Legacy modules tests not passing

1 parent a35a211 commit 504952e
Copy full SHA for 504952e

4 files changed

+17-13Lines changed: 17 additions & 13 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• dist
  • angular-meteor.js
• src/modules
  • angular-meteor-utils.js
• tests
  • integration/pre1.3
    • angular-meteor-collection-spec.js
  • package.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎dist/angular-meteor.js‎

Copy file name to clipboardExpand all lines: dist/angular-meteor.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -602,7 +602,7 @@
602	602	// Returns a callback which fulfills promise
603	603	this.fulfill = function (deferred, boundError, boundResult) {
604	604	return function (err, result) {
605		- if (err) deferred.reject(boundError === null ? err : boundError);else if (typeof boundResult == "function") deferred.resolve(boundResult === null ? result : boundResult(result));else deferred.resolve(boundResult === null ? result : boundResult);
	605	+ if (err) deferred.reject(boundError == null ? err : boundError);else if (typeof boundResult == "function") deferred.resolve(boundResult == null ? result : boundResult(result));else deferred.resolve(boundResult == null ? result : boundResult);
606	606	};
607	607	};
608	608

Collapse file

‎src/modules/angular-meteor-utils.js‎

Copy file name to clipboardExpand all lines: src/modules/angular-meteor-utils.js

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -58,11 +58,11 @@ angularMeteorUtils.service('$meteorUtils', [
58	58	this.fulfill = function(deferred, boundError, boundResult) {
59	59	return function(err, result) {
60	60	if (err)
61		- deferred.reject(boundError === null ? err : boundError);
	61	+ deferred.reject(boundError == null ? err : boundError);
62	62	else if (typeof boundResult == "function")
63		- deferred.resolve(boundResult === null ? result : boundResult(result));
	63	+ deferred.resolve(boundResult == null ? result : boundResult(result));
64	64	else
65		- deferred.resolve(boundResult === null ? result : boundResult);
	65	+ deferred.resolve(boundResult == null ? result : boundResult);
66	66	};
67	67	};
68	68

Collapse file

‎tests/integration/pre1.3/angular-meteor-collection-spec.js‎

Copy file name to clipboardExpand all lines: tests/integration/pre1.3/angular-meteor-collection-spec.js

+10-6Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -497,12 +497,14 @@ describe('$meteorCollection service', function() {
497	497	});
498	498
499	499	it('push updates from client handled correctly', function() {
500		- $rootScope.limit = 10;
	500	+ var $scope = $rootScope.$new();
	501	+ $scope.limit = 10;
501	502	var $ngCol = $meteorCollection(function() {
502	503	return DummyCollection.find({}, {
503		- limit: $rootScope.getReactively('limit') // TODO is not a function
	504	+ limit: $scope.getReactively('limit')
504	505	});
505		- });
	506	+ // A collection with no name can't be found so we'll need to pass it
	507	+ }, false, DummyCollection);
506	508	spyOn($ngCol, 'save');
507	509
508	510	// Adds docs on the client.
@@ -517,12 +519,14 @@ describe('$meteorCollection service', function() {
517	519	});
518	520
519	521	it('remove updates from client handled correctly', function() {
520		- $rootScope.limit = 10;
	522	+ var $scope = $rootScope.$new();
	523	+ $scope.limit = 10;
521	524	var $ngCol = $meteorCollection(function() {
522	525	return DummyCollection.find({}, {
523		- limit: $rootScope.getReactively('limit') // TODO is not a function
	526	+ limit: $scope.getReactively('limit')
524	527	});
525		- });
	528	+ // A collection with no name can't be found so we'll need to pass it
	529	+ }, false, DummyCollection);
526	530	spyOn($ngCol, 'remove').and.callThrough();
527	531
528	532	// Removes last two docs on the client.

Collapse file

‎tests/package.js‎

Copy file name to clipboardExpand all lines: tests/package.js

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -51,12 +51,12 @@ Package.onTest(function(api) {
51	51	'integration/pre1.3/angular-meteor-get-updates-spec.js',
52	52	'integration/pre1.3/angular-meteor-diff-array-spec.js',
53	53	'integration/pre1.3/angular-meteor-camera-spec.js',
54		- // 'integration/pre1.3/angular-meteor-collection-spec.js' // contains two failing tests (check todo)
	54	+ 'integration/pre1.3/angular-meteor-collection-spec.js',
55	55	'integration/pre1.3/angular-meteor-methods-spec.js',
56	56	'integration/pre1.3/angular-meteor-object-spec.js',
57	57	'integration/pre1.3/angular-meteor-session-spec.js',
58	58	'integration/pre1.3/angular-meteor-stopper-spec.js',
59		- 'integration/pre1.3/angular-meteor-subscribe-spec.js'
60		- // 'integration/pre1.3/angular-meteor-utils-spec.js' // contains three failing tests
	59	+ 'integration/pre1.3/angular-meteor-subscribe-spec.js',
	60	+ 'integration/pre1.3/angular-meteor-utils-spec.js'
61	61	], 'client');
62	62	});

0 commit comments

Comments

0 (0)