diff options
author | Mike Greiling <mike@pixelcog.com> | 2019-05-20 20:06:34 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-05-20 20:06:34 +0000 |
commit | 96725938c082e9f83c476da4dcb5d1e5b1863830 (patch) | |
tree | f094f98e0af8ebdf4a6b78238b04c0a893f9e994 | |
parent | 4063b7e811050c0870d782072664673e16eafdfe (diff) | |
parent | 878e69299bde9875f14c82bc1429c4b0145a2c69 (diff) | |
download | gitlab-ce-96725938c082e9f83c476da4dcb5d1e5b1863830.tar.gz |
Merge branch 'fe-rename-vue-component-helper-ce' into 'master'
[CE Port] Rename vue_component_helper to text_helper
See merge request gitlab-org/gitlab-ce!28358
21 files changed, 19 insertions, 19 deletions
diff --git a/spec/frontend/helpers/vue_component_helper.js b/spec/frontend/helpers/text_helper.js index e0fe18e5560..e0fe18e5560 100644 --- a/spec/frontend/helpers/vue_component_helper.js +++ b/spec/frontend/helpers/text_helper.js diff --git a/spec/javascripts/diffs/components/commit_item_spec.js b/spec/javascripts/diffs/components/commit_item_spec.js index 50e45f48af3..8fc9b10dd0b 100644 --- a/spec/javascripts/diffs/components/commit_item_spec.js +++ b/spec/javascripts/diffs/components/commit_item_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { TEST_HOST } from 'spec/test_constants'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; import { getTimeago } from '~/lib/utils/datetime_utility'; import CommitItem from '~/diffs/components/commit_item.vue'; import getDiffWithCommit from '../mock_data/diff_with_commit'; diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js b/spec/javascripts/environments/folder/environments_folder_view_spec.js index ff15067aeac..f1c323df4be 100644 --- a/spec/javascripts/environments/folder/environments_folder_view_spec.js +++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js @@ -3,7 +3,7 @@ import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import environmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { removeBreakLine, removeWhitespace } from 'spec/helpers/vue_component_helper'; +import { removeBreakLine, removeWhitespace } from 'spec/helpers/text_helper'; import { environmentsList } from '../mock_data'; describe('Environments Folder View', () => { diff --git a/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js b/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js index f00bc2eeb6d..dce8e3be148 100644 --- a/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js +++ b/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; import { shallowMount } from '@vue/test-utils'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; import { mockProject } from '../mock_data'; // can also use 'mockGroup', but not useful to test here const createComponent = () => { diff --git a/spec/javascripts/helpers/vue_component_helper.js b/spec/javascripts/helpers/text_helper.js index e0fe18e5560..e0fe18e5560 100644 --- a/spec/javascripts/helpers/vue_component_helper.js +++ b/spec/javascripts/helpers/text_helper.js diff --git a/spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js b/spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js index 9af3c15a4e3..3c7d6192e2c 100644 --- a/spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js +++ b/spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js @@ -3,7 +3,7 @@ import store from '~/ide/stores'; import listCollapsed from '~/ide/components/commit_sidebar/list_collapsed.vue'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { file } from '../../helpers'; -import { removeWhitespace } from '../../../helpers/vue_component_helper'; +import { removeWhitespace } from '../../../helpers/text_helper'; describe('Multi-file editor commit sidebar list collapsed', () => { let vm; diff --git a/spec/javascripts/ide/components/ide_review_spec.js b/spec/javascripts/ide/components/ide_review_spec.js index b9ee22b7c1a..396c5d282d4 100644 --- a/spec/javascripts/ide/components/ide_review_spec.js +++ b/spec/javascripts/ide/components/ide_review_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import IdeReview from '~/ide/components/ide_review.vue'; import store from '~/ide/stores'; import { createComponentWithStore } from '../../helpers/vue_mount_component_helper'; -import { trimText } from '../../helpers/vue_component_helper'; +import { trimText } from '../../helpers/text_helper'; import { resetStore, file } from '../helpers'; import { projectData } from '../mock_data'; diff --git a/spec/javascripts/ide/components/nav_dropdown_button_spec.js b/spec/javascripts/ide/components/nav_dropdown_button_spec.js index 0a58e260280..19b0071567a 100644 --- a/spec/javascripts/ide/components/nav_dropdown_button_spec.js +++ b/spec/javascripts/ide/components/nav_dropdown_button_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import NavDropdownButton from '~/ide/components/nav_dropdown_button.vue'; import store from '~/ide/stores'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; diff --git a/spec/javascripts/jobs/components/artifacts_block_spec.js b/spec/javascripts/jobs/components/artifacts_block_spec.js index 27d480ef2ea..58998d038e5 100644 --- a/spec/javascripts/jobs/components/artifacts_block_spec.js +++ b/spec/javascripts/jobs/components/artifacts_block_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import { getTimeago } from '~/lib/utils/datetime_utility'; import component from '~/jobs/components/artifacts_block.vue'; import mountComponent from '../../helpers/vue_mount_component_helper'; -import { trimText } from '../../helpers/vue_component_helper'; +import { trimText } from '../../helpers/text_helper'; describe('Artifacts block', () => { const Component = Vue.extend(component); diff --git a/spec/javascripts/jobs/components/sidebar_spec.js b/spec/javascripts/jobs/components/sidebar_spec.js index 3a02351460c..26d9effcac5 100644 --- a/spec/javascripts/jobs/components/sidebar_spec.js +++ b/spec/javascripts/jobs/components/sidebar_spec.js @@ -3,7 +3,7 @@ import sidebarDetailsBlock from '~/jobs/components/sidebar.vue'; import createStore from '~/jobs/store'; import job, { stages, jobsInStage } from '../mock_data'; import { mountComponentWithStore } from '../../helpers/vue_mount_component_helper'; -import { trimText } from '../../helpers/vue_component_helper'; +import { trimText } from '../../helpers/text_helper'; describe('Sidebar details block', () => { const SidebarComponent = Vue.extend(sidebarDetailsBlock); diff --git a/spec/javascripts/jobs/components/stages_dropdown_spec.js b/spec/javascripts/jobs/components/stages_dropdown_spec.js index eccb4e13d67..52bb5161123 100644 --- a/spec/javascripts/jobs/components/stages_dropdown_spec.js +++ b/spec/javascripts/jobs/components/stages_dropdown_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import component from '~/jobs/components/stages_dropdown.vue'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; import mountComponent from '../../helpers/vue_mount_component_helper'; describe('Stages Dropdown', () => { diff --git a/spec/javascripts/reports/components/modal_spec.js b/spec/javascripts/reports/components/modal_spec.js index 6b8471381de..d42c509e5b5 100644 --- a/spec/javascripts/reports/components/modal_spec.js +++ b/spec/javascripts/reports/components/modal_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import component from '~/reports/components/modal.vue'; import state from '~/reports/store/state'; import mountComponent from '../../helpers/vue_mount_component_helper'; -import { trimText } from '../../helpers/vue_component_helper'; +import { trimText } from '../../helpers/text_helper'; describe('Grouped Test Reports Modal', () => { const Component = Vue.extend(component); diff --git a/spec/javascripts/reports/components/test_issue_body_spec.js b/spec/javascripts/reports/components/test_issue_body_spec.js index 32baf904ad7..9c1cec4c9bc 100644 --- a/spec/javascripts/reports/components/test_issue_body_spec.js +++ b/spec/javascripts/reports/components/test_issue_body_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import component from '~/reports/components/test_issue_body.vue'; import createStore from '~/reports/store'; import { mountComponentWithStore } from '../../helpers/vue_mount_component_helper'; -import { trimText } from '../../helpers/vue_component_helper'; +import { trimText } from '../../helpers/text_helper'; import { issue } from '../mock_data/mock_data'; describe('Test Issue body', () => { diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js index 8ac6e6a7b44..75017d20473 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; import mockData from '../mock_data'; describe('MRWidgetPipeline', () => { diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js index 0ddbdf67d8b..39b879612ae 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import ConflictsComponent from '~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue'; -import { removeBreakLine } from 'spec/helpers/vue_component_helper'; +import { removeBreakLine } from 'spec/helpers/text_helper'; describe('MRWidgetConflicts', () => { let vm; diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js index 477041fa383..1d2f3e41509 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import pipelineBlockedComponent from '~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { removeBreakLine } from 'spec/helpers/vue_component_helper'; +import { removeBreakLine } from 'spec/helpers/text_helper'; describe('MRWidgetPipelineBlocked', () => { let vm; diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js index f7523a01963..3e4ce2c3696 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import PipelineFailed from '~/vue_merge_request_widget/components/states/pipeline_failed.vue'; -import { removeBreakLine } from 'spec/helpers/vue_component_helper'; +import { removeBreakLine } from 'spec/helpers/text_helper'; describe('PipelineFailed', () => { describe('template', () => { diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js index 36f8c7a9683..9324c83bf4b 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { removeBreakLine } from 'spec/helpers/vue_component_helper'; +import { removeBreakLine } from 'spec/helpers/text_helper'; describe('ShaMismatch', () => { let vm; diff --git a/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js b/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js index 268ced38f40..47964a1702a 100644 --- a/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js +++ b/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js @@ -1,6 +1,6 @@ import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; const localVue = createLocalVue(); diff --git a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js index 3ba0033171e..7f5f1a778d7 100644 --- a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js +++ b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js @@ -3,7 +3,7 @@ import _ from 'underscore'; import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue'; import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue'; import { shallowMount } from '@vue/test-utils'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; describe('ProjectSelector component', () => { let wrapper; diff --git a/spec/javascripts/vue_shared/translate_spec.js b/spec/javascripts/vue_shared/translate_spec.js index adb5ff682f0..0aaa4050cba 100644 --- a/spec/javascripts/vue_shared/translate_spec.js +++ b/spec/javascripts/vue_shared/translate_spec.js @@ -3,7 +3,7 @@ import Jed from 'jed'; import locale from '~/locale'; import Translate from '~/vue_shared/translate'; -import { trimText } from 'spec/helpers/vue_component_helper'; +import { trimText } from 'spec/helpers/text_helper'; describe('Vue translate filter', () => { let el; |