diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-28 21:01:58 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-05-03 13:42:55 -0500 |
| commit | a8684ea0bd834a1d98d7105fcf891009f72f1ef1 (patch) | |
| tree | bb0438eef30eb84667b93f0e012ea9c33d90190c | |
| parent | 6f98b013fd8b28232c21c4f3e798c3b1b650e66f (diff) | |
| download | gitlab-ce-a8684ea0bd834a1d98d7105fcf891009f72f1ef1.tar.gz | |
Fix failing karma spec
| -rw-r--r-- | app/assets/javascripts/create_merge_request_dropdown.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/issue_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js index 2762a9bc421..ada693828c2 100644 --- a/app/assets/javascripts/create_merge_request_dropdown.js +++ b/app/assets/javascripts/create_merge_request_dropdown.js @@ -76,7 +76,7 @@ export default class CreateMergeRequestDropdown { checkAbilityToCreateBranch() { return $.ajax({ - method: 'GET', + type: 'GET', dataType: 'json', url: this.canCreatePath, beforeSend: () => this.setUnavailableButtonState(), diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js index 4cc58e3254b..0fd573eae3f 100644 --- a/spec/javascripts/issue_spec.js +++ b/spec/javascripts/issue_spec.js @@ -109,7 +109,7 @@ describe('Issue', function() { expectNewBranchButtonState(true, false); return this.issueStateDeferred; } else if (req.url === Issue.createMrDropdownWrap.dataset.canCreatePath) { - expect(req.type).toBe('get'); + expect(req.type).toBe('GET'); expectNewBranchButtonState(true, false); return this.canCreateBranchDeferred; } |