Skip to content

Commit dc848e4

Browse files
committed
release(): v2.1.0
1 parent 6b279dd commit dc848e4

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
<a name="2.1.0"></a>
2+
## 2.1.0 (2014-11-13)
3+
4+
5+
#### Features
6+
7+
* **promiseTracker:** upgrade to angular 1.3 ([faf1eb01](http://github.com/ajoslin/angular-promise-tracker/commit/faf1eb01e9ebfd5fe03f4683748a45498d5692e4))
8+
9+
110
<a name="2.0.1"></a>
211
### 2.0.1 (2014-04-11)
312

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Andy Joslin",
33
"name": "promise-tracker",
44
"description": "Easily add spinners or general request tracking to your angular app.",
5-
"version": "2.0.1",
5+
"version": "2.1.0",
66
"homepage": "http://github.com/ajoslin/angular-promise-tracker",
77
"repository": {
88
"type": "git",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-promise-tracker",
3-
"version": "2.0.1",
3+
"version": "2.1.0",
44
"main": "promise-tracker.js",
55
"author": {
66
"name": "Andy Joslin"

promise-tracker-http-interceptor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* promise-tracker - v2.0.1 - 2014-04-11
2+
* promise-tracker - v2.1.0 - 2014-11-15
33
* http://github.com/ajoslin/angular-promise-tracker
44
* Created by Andy Joslin; Licensed under Public Domain
55
*/

promise-tracker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* promise-tracker - v2.0.1 - 2014-04-11
2+
* promise-tracker - v2.1.0 - 2014-11-15
33
* http://github.com/ajoslin/angular-promise-tracker
44
* Created by Andy Joslin; Licensed under Public Domain
55
*/
@@ -131,4 +131,4 @@ angular.module('ajoslin.promise-tracker', [])
131131
}];
132132
});
133133

134-
}());
134+
}());

test/unit/provider.spec.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ describe('promiseTracker provider', function() {
4646

4747
it('should not error with then, $then, $promise.then', function() {
4848
promiseTracker().addPromise(q.defer().promise);
49-
promiseTracker().addPromise({ then: q.defer().promise.then });
50-
promiseTracker().addPromise({ $promise: { then: q.defer().promise.then } });
49+
promiseTracker().addPromise({ $promise: q.defer().promise } );
5150
});
5251

5352
it('should return promise from createPromise', function() {
@@ -87,11 +86,11 @@ describe('promiseTracker provider', function() {
8786
expect(tracker.tracking()).toBe(true);
8887

8988
tracker = promiseTracker();
90-
tracker.addPromise({ then: q.defer().promise.then });
89+
tracker.addPromise(q.defer().promise);
9190
expect(tracker.tracking()).toBe(true);
9291

9392
tracker = promiseTracker();
94-
tracker.addPromise({ $promise: { then: q.defer().promise.then } });
93+
tracker.addPromise({ $promise: q.defer().promise });
9594
expect(tracker.tracking()).toBe(true);
9695
});
9796

0 commit comments

Comments
 (0)