diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-26 19:03:28 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-26 19:03:28 +0300 |
| commit | ad985a7a28c19a085011afc7531f4f2c13783cb2 (patch) | |
| tree | 56546845700e6551628d6ad79d46b74901a25460 /spec/javascripts/vue_mr_widget | |
| parent | 02b29ce8846760ac91ec560d737a38497a5b9155 (diff) | |
Merge branch 'winh-remove-sushi' into 'master'
Remove .raw from JavaScript fixture file names
Closes #59201
See merge request gitlab-org/gitlab-ce!26430
(cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
Diffstat (limited to 'spec/javascripts/vue_mr_widget')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 30659ad16f3..368c997d318 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -415,7 +415,7 @@ describe('ReadyToMerge', () => { }); beforeEach(() => { - loadFixtures('merge_requests/merge_request_of_current_user.html.raw'); + loadFixtures('merge_requests/merge_request_of_current_user.html'); }); it('should call start and stop polling when MR merged', done => { |