From e60d5b0d804d47569cf55200e39a0870550556f2 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Fri, 22 Mar 2019 00:21:51 +0000 Subject: [PATCH] Remove `.raw` EE JS fixtures `.html.raw` JS fixtures are no longer created. We now use `.html`. --- .../javascripts/approvals/setup_single_rule_approvals_spec.js | 4 ++-- .../javascripts/ci_variable_list/ci_variable_list_ee_spec.js | 4 ++-- ee/spec/javascripts/fixtures/merge_requests.rb | 2 +- ee/spec/javascripts/fixtures/saml_providers.rb | 2 +- ee/spec/javascripts/kubernetes_logs_spec.js | 2 +- ee/spec/javascripts/multiple_assignees/sidebar_spec.js | 4 ++-- .../javascripts/prometheus_metrics/prometheus_metrics_spec.js | 2 +- ee/spec/javascripts/saml_providers/dirty_form_checker_spec.js | 2 +- ee/spec/javascripts/saml_providers/saml_settings_form_spec.js | 2 +- spec/javascripts/fixtures/static_fixtures.rb | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ee/spec/javascripts/approvals/setup_single_rule_approvals_spec.js b/ee/spec/javascripts/approvals/setup_single_rule_approvals_spec.js index 551ca36819584c..badf405c54edd5 100644 --- a/ee/spec/javascripts/approvals/setup_single_rule_approvals_spec.js +++ b/ee/spec/javascripts/approvals/setup_single_rule_approvals_spec.js @@ -2,13 +2,13 @@ import $ from 'jquery'; import setup from 'ee/approvals/setup_single_rule_approvals'; describe('EE setup_single_rule_approvals', () => { - preloadFixtures('merge_requests_ee/merge_request_edit.html.raw'); + preloadFixtures('merge_requests_ee/merge_request_edit.html'); let $approversEl; let $suggestionEl; beforeEach(() => { - loadFixtures('merge_requests_ee/merge_request_edit.html.raw'); + loadFixtures('merge_requests_ee/merge_request_edit.html'); $approversEl = $('ul.approver-list'); $suggestionEl = $('.suggested-approvers'); setup(); diff --git a/ee/spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js b/ee/spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js index bbc8cc04d557ae..fdbb5acdeaea4d 100644 --- a/ee/spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js +++ b/ee/spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js @@ -3,14 +3,14 @@ import VariableList from '~/ci_variable_list/ci_variable_list'; import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper'; describe('VariableList (EE features)', () => { - preloadFixtures('projects/ci_cd_settings.html.raw'); + preloadFixtures('projects/ci_cd_settings.html'); let $wrapper; let variableList; describe('with all inputs(key, value, protected, environment)', () => { beforeEach(() => { - loadFixtures('projects/ci_cd_settings.html.raw'); + loadFixtures('projects/ci_cd_settings.html'); $wrapper = $('.js-ci-variable-list-section'); variableList = new VariableList({ diff --git a/ee/spec/javascripts/fixtures/merge_requests.rb b/ee/spec/javascripts/fixtures/merge_requests.rb index 79a3f497416fcc..5fb6a66a01b551 100644 --- a/ee/spec/javascripts/fixtures/merge_requests.rb +++ b/ee/spec/javascripts/fixtures/merge_requests.rb @@ -42,7 +42,7 @@ remove_repository(project) end - it 'merge_requests_ee/merge_request_edit.html.raw' do |example| + it 'merge_requests_ee/merge_request_edit.html' do |example| get :edit, params: { id: merge_request.id, diff --git a/ee/spec/javascripts/fixtures/saml_providers.rb b/ee/spec/javascripts/fixtures/saml_providers.rb index 70a5ecd19c2558..65f4dc297b55eb 100644 --- a/ee/spec/javascripts/fixtures/saml_providers.rb +++ b/ee/spec/javascripts/fixtures/saml_providers.rb @@ -20,7 +20,7 @@ stub_licensed_features(group_saml: true) end - it 'groups/saml_providers/show.html.raw' do |example| + it 'groups/saml_providers/show.html' do |example| create(:saml_provider, group: group) get :show, params: { group_id: group } diff --git a/ee/spec/javascripts/kubernetes_logs_spec.js b/ee/spec/javascripts/kubernetes_logs_spec.js index 0ee807bd7b1654..a2a4bee756bd39 100644 --- a/ee/spec/javascripts/kubernetes_logs_spec.js +++ b/ee/spec/javascripts/kubernetes_logs_spec.js @@ -5,7 +5,7 @@ import axios from '~/lib/utils/axios_utils'; import { logMockData, podMockData } from './kubernetes_mock_data'; describe('Kubernetes Logs', () => { - const fixtureTemplate = 'static/environments_logs.html.raw'; + const fixtureTemplate = 'static/environments_logs.html'; const mockPodName = 'production-tanuki-1'; const logMockPath = '/root/kubernetes-app/environments/1/logs'; let kubernetesLogContainer; diff --git a/ee/spec/javascripts/multiple_assignees/sidebar_spec.js b/ee/spec/javascripts/multiple_assignees/sidebar_spec.js index 56339a3b47b500..a48fec63412226 100644 --- a/ee/spec/javascripts/multiple_assignees/sidebar_spec.js +++ b/ee/spec/javascripts/multiple_assignees/sidebar_spec.js @@ -1,7 +1,7 @@ describe('Sidebar', () => { - preloadFixtures('issues/open-issue.html.raw'); + preloadFixtures('issues/open-issue.html'); - beforeEach(() => loadFixtures('issues/open-issue.html.raw')); + beforeEach(() => loadFixtures('issues/open-issue.html')); it('does not have a max select', () => { const dropdown = document.querySelector('.js-author-search'); diff --git a/ee/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/ee/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js index 4a2bcfb2821ef6..598db274734a6e 100644 --- a/ee/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js +++ b/ee/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js @@ -5,7 +5,7 @@ import PANEL_STATE from '~/prometheus_metrics/constants'; import metrics from './mock_data'; describe('PrometheusMetrics EE', () => { - const FIXTURE = 'services/prometheus/prometheus_service.html.raw'; + const FIXTURE = 'services/prometheus/prometheus_service.html'; const customMetricsEndpoint = 'http://test.host/frontend-fixtures/services-project/prometheus/metrics'; let mock; diff --git a/ee/spec/javascripts/saml_providers/dirty_form_checker_spec.js b/ee/spec/javascripts/saml_providers/dirty_form_checker_spec.js index b350d64144c5b7..48133b28aa20e0 100644 --- a/ee/spec/javascripts/saml_providers/dirty_form_checker_spec.js +++ b/ee/spec/javascripts/saml_providers/dirty_form_checker_spec.js @@ -1,7 +1,7 @@ import DirtyFormChecker from 'ee/saml_providers/dirty_form_checker'; describe('DirtyFormChecker', () => { - const FIXTURE = 'groups/saml_providers/show.html.raw'; + const FIXTURE = 'groups/saml_providers/show.html'; preloadFixtures(FIXTURE); beforeEach(() => { diff --git a/ee/spec/javascripts/saml_providers/saml_settings_form_spec.js b/ee/spec/javascripts/saml_providers/saml_settings_form_spec.js index dddefc16945fca..673d4e3b84a35d 100644 --- a/ee/spec/javascripts/saml_providers/saml_settings_form_spec.js +++ b/ee/spec/javascripts/saml_providers/saml_settings_form_spec.js @@ -1,7 +1,7 @@ import SamlSettingsForm from 'ee/saml_providers/saml_settings_form'; describe('SamlSettingsForm', () => { - const FIXTURE = 'groups/saml_providers/show.html.raw'; + const FIXTURE = 'groups/saml_providers/show.html'; preloadFixtures(FIXTURE); beforeEach(() => { diff --git a/spec/javascripts/fixtures/static_fixtures.rb b/spec/javascripts/fixtures/static_fixtures.rb index b5188eeb9943db..cb4b90cdca595e 100644 --- a/spec/javascripts/fixtures/static_fixtures.rb +++ b/spec/javascripts/fixtures/static_fixtures.rb @@ -4,7 +4,7 @@ include JavaScriptFixturesHelpers Dir.glob('{,ee/}spec/javascripts/fixtures/**/*.haml').map do |file_path| - it "static/#{file_path.sub(%r{\A(ee/)?spec/javascripts/fixtures/}, '').sub(/\.haml\z/, '.raw')}" do |example| + it "static/#{file_path.sub(%r{\A(ee/)?spec/javascripts/fixtures/}, '').sub(/\.haml\z/, '')}" do |example| store_frontend_fixture(render_template(file_path), example.description) end end -- GitLab