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/gl_dropdown_spec.js | |
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/gl_dropdown_spec.js')
-rw-r--r-- | spec/javascripts/gl_dropdown_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js index 85083653db8..57e31d933ca 100644 --- a/spec/javascripts/gl_dropdown_spec.js +++ b/spec/javascripts/gl_dropdown_spec.js @@ -5,7 +5,7 @@ import GLDropdown from '~/gl_dropdown'; import '~/lib/utils/common_utils'; describe('glDropdown', function describeDropdown() { - preloadFixtures('static/gl_dropdown.html.raw'); + preloadFixtures('static/gl_dropdown.html'); loadJSONFixtures('projects.json'); const NON_SELECTABLE_CLASSES = @@ -64,7 +64,7 @@ describe('glDropdown', function describeDropdown() { } beforeEach(() => { - loadFixtures('static/gl_dropdown.html.raw'); + loadFixtures('static/gl_dropdown.html'); this.dropdownContainerElement = $('.dropdown.inline'); this.$dropdownMenuElement = $('.dropdown-menu', this.dropdownContainerElement); this.projectsData = getJSONFixture('projects.json'); |