diff options
| author | Steffen Rauh <steffen.rauh@gmx.de> | 2016-12-03 23:04:21 +0100 |
|---|---|---|
| committer | Steffen Rauh <steffen.rauh@gmx.de> | 2016-12-03 23:04:21 +0100 |
| commit | 0d53e97ee80be012d4b486092098333a0185c69b (patch) | |
| tree | de336c8c28f32379bd451c85fcf8a0234c92a5f8 | |
| parent | 0966c6d2c674f288be3f1adf576a2fa2aada3691 (diff) | |
| download | gitlab-ce-0d53e97ee80be012d4b486092098333a0185c69b.tar.gz | |
Satisfied eslint
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.es6 | 2 | ||||
| -rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.es6 b/app/assets/javascripts/merge_request_tabs.js.es6 index 771803edb7c..3ec0f1fd613 100644 --- a/app/assets/javascripts/merge_request_tabs.js.es6 +++ b/app/assets/javascripts/merge_request_tabs.js.es6 @@ -225,7 +225,7 @@ // We extract pathname for the current Changes tab anchor href // some pages like MergeRequestsController#new has query parameters on that anchor - var urlPathname = gl.utils.parseUrlPathname(source); + const urlPathname = gl.utils.parseUrlPathname(source); this.ajaxGet({ url: `${urlPathname}.json${location.search}`, diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 4facc42c5b4..130d391bfab 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -29,7 +29,7 @@ describe('#activateTab', function () { beforeEach(function () { - spyOn($, 'ajax').and.callFake(function() {}); + spyOn($, 'ajax').and.callFake(function () {}); fixture.load('merge_request_tabs.html'); this.subject = this.class.activateTab; }); @@ -53,7 +53,7 @@ describe('#setCurrentAction', function () { beforeEach(function () { - spyOn($, 'ajax').and.callFake(function() {}); + spyOn($, 'ajax').and.callFake(function () {}); this.subject = this.class.setCurrentAction; }); it('changes from commits', function () { @@ -110,9 +110,9 @@ expect(this.subject('show')).toBe('/foo/bar/merge_requests/1'); }); }); - describe('#loadDiff', function() { - it('requires an absolute pathname', function() { - spyOn($, 'ajax').and.callFake(function(options) { + describe('#loadDiff', function () { + it('requires an absolute pathname', function () { + spyOn($, 'ajax').and.callFake(function (options) { expect(options.url).toEqual('/foo/bar/merge_requests/1/diffs.json'); }); this.class.loadDiff('/foo/bar/merge_requests/1/diffs'); |