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/filtered_search | |
| 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/filtered_search')
| -rw-r--r-- | spec/javascripts/filtered_search/dropdown_user_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/filtered_search/dropdown_utils_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/filtered_search/dropdown_user_spec.js b/spec/javascripts/filtered_search/dropdown_user_spec.js index e8fcc8592eb..f764800fff0 100644 --- a/spec/javascripts/filtered_search/dropdown_user_spec.js +++ b/spec/javascripts/filtered_search/dropdown_user_spec.js @@ -72,7 +72,7 @@ describe('Dropdown User', () => { }); describe('hideCurrentUser', () => { - const fixtureTemplate = 'issues/issue_list.html.raw'; + const fixtureTemplate = 'issues/issue_list.html'; preloadFixtures(fixtureTemplate); let dropdown; diff --git a/spec/javascripts/filtered_search/dropdown_utils_spec.js b/spec/javascripts/filtered_search/dropdown_utils_spec.js index cfd0b96ec43..62d1bd69635 100644 --- a/spec/javascripts/filtered_search/dropdown_utils_spec.js +++ b/spec/javascripts/filtered_search/dropdown_utils_spec.js @@ -4,7 +4,7 @@ import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered import FilteredSearchSpecHelper from '../helpers/filtered_search_spec_helper'; describe('Dropdown Utils', () => { - const issueListFixture = 'issues/issue_list.html.raw'; + const issueListFixture = 'issues/issue_list.html'; preloadFixtures(issueListFixture); describe('getEscapedText', () => { |