Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 5e706ab

Browse files
mgolmgol
committed
[WIP]
1 parent 840ada4 commit 5e706ab

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎test/ngMock/angular-mocksSpec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1742,23 +1742,23 @@ describe('ngMock', function() {
17421742
angular.forEach(['expectRoute', 'whenRoute'], function(routeShortcut) {
17431743
var methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'JSONP'];
17441744
they('should provide ' + routeShortcut + ' shortcut with $prop method', methods,
1745-
/** @this **/ function() {
1745+
/* @this */ function() {
17461746
hb[routeShortcut](this, '/route').respond('path');
17471747
hb(this, '/route', undefined, callback);
17481748
hb.flush();
17491749
expect(callback).toHaveBeenCalledOnceWith(200, 'path', '', '');
17501750
}
17511751
);
17521752
they('should match colon deliminated parameters in ' + routeShortcut + ' $prop method', methods,
1753-
/** @this **/ function() {
1753+
/* @this */ function() {
17541754
hb[routeShortcut](this, '/route/:id/path/:s_id').respond('path');
17551755
hb(this, '/route/123/path/456', undefined, callback);
17561756
hb.flush();
17571757
expect(callback).toHaveBeenCalledOnceWith(200, 'path', '', '');
17581758
}
17591759
);
17601760
they('should ignore query param when matching in ' + routeShortcut + ' $prop method', methods,
1761-
/** @this **/ function() {
1761+
/* @this */ function() {
17621762
hb[routeShortcut](this, '/route/:id').respond('path');
17631763
hb(this, '/route/123?q=str&foo=bar', undefined, callback);
17641764
hb.flush();
@@ -2031,7 +2031,7 @@ describe('ngMock', function() {
20312031
{ name: 'flurp', id: 2 }
20322032
];
20332033
module(function($controllerProvider) {
2034-
$controllerProvider.register('testCtrl', /** @this **/ function() {
2034+
$controllerProvider.register('testCtrl', /* @this */ function() {
20352035
called = true;
20362036
expect(this.data).toBe(data);
20372037
});
@@ -2051,7 +2051,7 @@ describe('ngMock', function() {
20512051
{ name: 'flurp', id: 2 }
20522052
];
20532053
module(function($controllerProvider) {
2054-
$controllerProvider.register('testCtrl', /** @this **/ function() {
2054+
$controllerProvider.register('testCtrl', /* @this */ function() {
20552055
called = true;
20562056
expect(this.data).toBe(data);
20572057

@@ -2961,7 +2961,7 @@ describe('sharedInjector', function() {
29612961

29622962
// run a set of test cases in the sdescribe stub test framework
29632963
function ngMockTest(define) {
2964-
return /** @this **/ function() {
2964+
return /* @this */ function() {
29652965
var spec = this;
29662966
module.$$currentSpec(null);
29672967

‎test/ngScenario/ApplicationSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('angular.scenario.Application', function() {
4848
app.getWindow_ = function() {
4949
return testWindow;
5050
};
51-
app.executeAction(/** @this **/ function($window, $document) {
51+
app.executeAction(/* @this */ function($window, $document) {
5252
expect(this).toEqual(app);
5353
expect($document).toEqual(_jQuery($window.document));
5454
expect($window).toEqual(testWindow);

‎test/ngScenario/DescribeSpec.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ describe('angular.scenario.Describe', function() {
2626
});
2727

2828
it('should handle basic nested case', function() {
29-
root.describe('A', /** @this **/ function() {
29+
root.describe('A', /* @this */ function() {
3030
this.beforeEach(log.fn('{'));
3131
this.afterEach(log.fn('}'));
3232
this.it('1', log.fn('1'));
33-
this.describe('B', /** @this **/ function() {
33+
this.describe('B', /* @this */ function() {
3434
this.beforeEach(log.fn('('));
3535
this.afterEach(log.fn(')'));
3636
this.it('2', log.fn('2'));
@@ -54,11 +54,11 @@ describe('angular.scenario.Describe', function() {
5454
});
5555

5656
it('should link nested describe blocks with parent and children', function() {
57-
root.describe('A', /** @this **/ function() {
57+
root.describe('A', /* @this */ function() {
5858
this.it('1', angular.noop);
59-
this.describe('B', /** @this **/ function() {
59+
this.describe('B', /* @this */ function() {
6060
this.it('2', angular.noop);
61-
this.describe('C', /** @this **/ function() {
61+
this.describe('C', /* @this */ function() {
6262
this.it('3', angular.noop);
6363
});
6464
});
@@ -69,11 +69,11 @@ describe('angular.scenario.Describe', function() {
6969
});
7070

7171
it('should not process xit and xdescribe', function() {
72-
root.describe('A', /** @this **/ function() {
72+
root.describe('A', /* @this */ function() {
7373
this.xit('1', angular.noop);
74-
this.xdescribe('B', /** @this **/ function() {
74+
this.xdescribe('B', /* @this */ function() {
7575
this.it('2', angular.noop);
76-
this.describe('C', /** @this **/ function() {
76+
this.describe('C', /* @this */ function() {
7777
this.it('3', angular.noop);
7878
});
7979
});
@@ -84,14 +84,14 @@ describe('angular.scenario.Describe', function() {
8484

8585

8686
it('should only return iit and ddescribe if present', function() {
87-
root.describe('A', /** @this **/ function() {
87+
root.describe('A', /* @this */ function() {
8888
this.it('1', angular.noop);
8989
this.iit('2', angular.noop);
90-
this.describe('B', /** @this **/ function() {
90+
this.describe('B', /* @this */ function() {
9191
this.it('3', angular.noop);
92-
this.ddescribe('C', /** @this **/ function() {
92+
this.ddescribe('C', /* @this */ function() {
9393
this.it('4', angular.noop);
94-
this.describe('D', /** @this **/ function() {
94+
this.describe('D', /* @this */ function() {
9595
this.it('5', angular.noop);
9696
});
9797
});

‎test/ngScenario/SpecRunnerSpec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('angular.scenario.SpecRunner', function() {
5151
}));
5252

5353
it('should bind futures to the spec', function() {
54-
runner.addFuture('test future', /** @this **/ function(done) {
54+
runner.addFuture('test future', /* @this */ function(done) {
5555
this.value = 10;
5656
done();
5757
});
@@ -72,7 +72,7 @@ describe('angular.scenario.SpecRunner', function() {
7272

7373
it('should execute spec function and notify UI', function() {
7474
var finished;
75-
var spec = createSpec('test spec', /** @this **/ function() {
75+
var spec = createSpec('test spec', /* @this */ function() {
7676
this.test = 'some value';
7777
});
7878
runner.addFuture('test future', function(done) {
@@ -128,7 +128,7 @@ describe('angular.scenario.SpecRunner', function() {
128128

129129
it('should execute notify UI on step error', function() {
130130
var finished;
131-
var spec = createSpec('test spec', /** @this **/ function() {
131+
var spec = createSpec('test spec', /* @this */ function() {
132132
this.addFuture('test future', function(done) {
133133
throw new Error('error message');
134134
});
@@ -148,7 +148,7 @@ describe('angular.scenario.SpecRunner', function() {
148148

149149
it('should run after handlers even if error in body of spec', function() {
150150
var finished, after;
151-
var spec = createSpec('test spec', /** @this **/ function() {
151+
var spec = createSpec('test spec', /* @this */ function() {
152152
this.addFuture('body', function(done) {
153153
throw new Error('error message');
154154
});

‎test/ngScenario/mocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ angular.scenario.testing.MockRunner.prototype.on = function(eventName, fn) {
2727

2828
angular.scenario.testing.MockRunner.prototype.emit = function(eventName) {
2929
var args = Array.prototype.slice.call(arguments, 1);
30-
angular.forEach(this.listeners[eventName] || [], /** @this **/ function(fn) {
30+
angular.forEach(this.listeners[eventName] || [], /* @this */ function(fn) {
3131
fn.apply(this, args);
3232
});
3333
};

0 commit comments

Comments
 (0)