diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 09:07:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 09:07:49 +0000 |
| commit | 0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (patch) | |
| tree | 8462503456eb030bb1042c6af73edc8f8af49fc6 | |
| parent | b24ae1cbc66e5b0f622393bcf2c59711750161ea (diff) | |
| download | gitlab-ce-0ba3a054d2190094ffda1ebe3aa53ffc5b92247d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
206 files changed, 263 insertions, 351 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index d444f6be21d..cec4ce204f8 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -197,6 +197,7 @@ export const discardFileChanges = ({ dispatch, state, commit, getters }, path) = if (file.tempFile) { dispatch('deleteEntry', file.path); } else { + commit(types.DISCARD_FILE_CHANGES, file.path); dispatch('renameEntry', { path: file.path, name: file.prevName, diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index 1b126352330..73d03e57f54 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -132,7 +132,7 @@ export default { [types.DISCARD_FILE_CHANGES](state, path) { const stagedFile = state.stagedFiles.find(f => f.path === path); const entry = state.entries[path]; - const { deleted, prevPath } = entry; + const { deleted } = entry; Object.assign(state.entries[path], { content: stagedFile ? stagedFile.content : state.entries[path].raw, @@ -146,12 +146,6 @@ export default { : state.trees[`${state.currentProjectId}/${state.currentBranchId}`]; parent.tree = sortTree(parent.tree.concat(entry)); - } else if (prevPath) { - const parent = entry.parentPath - ? state.entries[entry.parentPath] - : state.trees[`${state.currentProjectId}/${state.currentBranchId}`]; - - parent.tree = parent.tree.filter(f => f.path !== path); } }, [types.ADD_FILE_TO_CHANGED](state, path) { diff --git a/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml b/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml new file mode 100644 index 00000000000..f5baaab2382 --- /dev/null +++ b/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml @@ -0,0 +1,5 @@ +--- +title: Update IDE discard of renamed entry to also discard file changes +merge_request: 22573 +author: +type: fixed diff --git a/changelogs/unreleased/cluster-applications-0-4-0.yml b/changelogs/unreleased/cluster-applications-0-4-0.yml new file mode 100644 index 00000000000..0a06107bf62 --- /dev/null +++ b/changelogs/unreleased/cluster-applications-0-4-0.yml @@ -0,0 +1,5 @@ +--- +title: Bump cluster-applications image to v0.4.0, adding support to install cert-manager +merge_request: 22657 +author: +type: changed diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md index 9200ef69a31..24a16fe6a70 100644 --- a/doc/ci/variables/predefined_variables.md +++ b/doc/ci/variables/predefined_variables.md @@ -86,7 +86,7 @@ future GitLab releases.** | `CI_PAGES_URL` | 11.8 | all | URL to GitLab Pages-built pages. Always belongs to a subdomain of `CI_PAGES_DOMAIN`. | | `CI_PIPELINE_ID` | 8.10 | all | The unique id of the current pipeline that GitLab CI uses internally | | `CI_PIPELINE_IID` | 11.0 | all | The unique id of the current pipeline scoped to project | -| `CI_PIPELINE_SOURCE` | 10.0 | all | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, `pipeline` and `merge_request_event`. For pipelines created before GitLab 9.5, this will show as `unknown` | +| `CI_PIPELINE_SOURCE` | 10.0 | all | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, `pipeline`, `external`, `chat`, `merge_request_event`, and `external_pull_request_event`. For pipelines created before GitLab 9.5, this will show as `unknown` | | `CI_PIPELINE_TRIGGERED` | all | all | The flag to indicate that job was [triggered](../triggers/README.md) | | `CI_PIPELINE_URL` | 11.1 | 0.5 | Pipeline details URL | | `CI_PROJECT_DIR` | all | all | The full path where the repository is cloned and where the job is run. If the GitLab Runner `builds_dir` parameter is set, this variable is set relative to the value of `builds_dir`. For more information, see [Advanced configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section) for GitLab Runner. | diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 1d735f4e221..c2d6ed58118 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -729,7 +729,18 @@ Learn more about [variables expressions](../variables/README.md#environment-vari Using the `changes` keyword with `only` or `except` makes it possible to define if a job should be created based on files modified by a Git push event. -For example: +This means the `only:changes` policy is useful for pipelines where: + +- `$CI_PIPELINE_SOURCE == 'push'` +- `$CI_PIPELINE_SOURCE == 'merge_request_event'` +- `$CI_PIPELINE_SOURCE == 'external_pull_request_event'` + +If there is no Git push event, such as for pipelines with +[sources other than the three above](../variables/predefined_variables.html#variables-reference), +`changes` cannot determine if a given file is new or old, and will always +return true. + +A basic example of using `only: changes`: ```yaml docker build: @@ -910,8 +921,9 @@ at all, the behavior defaults to `job:when`, which continues to default to #### `rules:changes` -`changes` works exactly the same way as [`only`/`except`](#onlychangesexceptchanges), -accepting an array of paths. +`rules: changes` works exactly the same way as `only: changes` and `except: changes`, +accepting an array of paths. Similarly, it will always return true if there is no +Git push event. See [`only/except: changes`](#onlychangesexceptchanges) for more information. For example: diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 0b889a29674..0e584003c1c 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -35,7 +35,7 @@ The following applications can be installed: - [Helm](#helm) - [Ingress](#ingress) -- [Cert-Manager](#cert-manager) +- [cert-manager](#cert-manager) - [Prometheus](#prometheus) - [GitLab Runner](#gitlab-runner) - [JupyterHub](#jupyterhub) @@ -73,13 +73,13 @@ Installing Helm as a GitLab-managed App behind a proxy is not supported, but a [workaround](../../topics/autodevops/index.md#installing-helm-behind-a-proxy) is available. -### Cert-Manager +### cert-manager > Introduced in GitLab 11.6 for project- and group-level clusters. -[Cert-Manager](https://docs.cert-manager.io/en/latest/) is a native +[cert-manager](https://docs.cert-manager.io/en/latest/) is a native Kubernetes certificate management controller that helps with issuing -certificates. Installing Cert-Manager on your cluster will issue a +certificates. Installing cert-manager on your cluster will issue a certificate by [Let's Encrypt](https://letsencrypt.org/) and ensure that certificates are valid and up-to-date. @@ -91,13 +91,13 @@ The chart used to install this application depends on the version of GitLab used - GitLab 12.2 and older, the [stable/cert-manager](https://github.com/helm/charts/tree/master/stable/cert-manager) chart was used. -If you have installed Cert-Manager prior to GitLab 12.3, Let's Encrypt will -[block requests from older versions of Cert-Manager](https://community.letsencrypt.org/t/blocking-old-cert-manager-versions/98753). +If you have installed cert-manager prior to GitLab 12.3, Let's Encrypt will +[block requests from older versions of cert-manager](https://community.letsencrypt.org/t/blocking-old-cert-manager-versions/98753). To resolve this: -1. Uninstall Cert-Manager (consider [backing up any additional configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html)). -1. Install Cert-Manager again. +1. Uninstall cert-manager (consider [backing up any additional configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html)). +1. Install cert-manager again. ### GitLab Runner @@ -446,6 +446,7 @@ install using Helm `values.yaml` files. Supported applications: - [Ingress](#install-ingress-using-gitlab-ci) +- [cert-manager](#install-cert-manager-using-gitlab-ci) - [Sentry](#install-sentry-using-gitlab-ci) ### Usage @@ -499,6 +500,43 @@ management project. Refer to the [chart](https://github.com/helm/charts/tree/master/stable/nginx-ingress) for the available configuration options. +### Install cert-manager using GitLab CI + +cert-manager is installed using GitLab CI by defining configuration in +`.gitlab/managed-apps/config.yaml`. + +cert-manager: + +- Is installed into the `gitlab-managed-apps` namespace of your cluster. +- Can be installed with or without a default [Let's Encrypt `ClusterIssuer`](https://cert-manager.io/docs/configuration/acme/), which requires an + email address to be specified. The email address is used by Let's Encrypt to + contact you about expiring certificates and issues related to your account. + +The following configuration is required to install cert-manager using GitLab CI: + +```yaml +certManager: + installed: true + letsEncryptClusterIssuer: + installed: true + email: "user@example.com" +``` + +The following installs cert-manager using GitLab CI without the default `ClusterIssuer`: + +```yaml +certManager: + installed: true + letsEncryptClusterIssuer: + installed: false +``` + +You can customize the installation of Ingress by defining +`.gitlab/managed-apps/cert-manager/values.yaml` file in your cluster +management project. Refer to the +[chart](https://hub.helm.sh/charts/jetstack/cert-manager) for the +available configuration options. + ### Install Sentry using GitLab CI NOTE: **Note:** @@ -593,7 +631,7 @@ The applications below can be uninstalled. | Application | GitLab version | Notes | | ----------- | -------------- | ----- | -| Cert-Manager | 12.2+ | The associated private key will be deleted and cannot be restored. Deployed applications will continue to use HTTPS, but certificates will not be renewed. Before uninstalling, you may wish to [back up your configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html) or [revoke your certificates](https://letsencrypt.org/docs/revoking/). | +| cert-manager | 12.2+ | The associated private key will be deleted and cannot be restored. Deployed applications will continue to use HTTPS, but certificates will not be renewed. Before uninstalling, you may wish to [back up your configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html) or [revoke your certificates](https://letsencrypt.org/docs/revoking/). | | GitLab Runner | 12.2+ | Any running pipelines will be canceled. | | Helm | 12.2+ | The associated Tiller pod, the `gitlab-managed-apps` namespace, and all of its resources will be deleted and cannot be restored. | | Ingress | 12.1+ | The associated load balancer and IP will be deleted and cannot be restored. Furthermore, it can only be uninstalled if JupyterHub is not installed. | diff --git a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml index 9a5b0f79ecf..08085553c7b 100644 --- a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml @@ -1,6 +1,6 @@ apply: stage: deploy - image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.3.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.4.0" environment: name: production variables: @@ -9,7 +9,6 @@ apply: INGRESS_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/ingress/values.yaml SENTRY_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/sentry/values.yaml script: - - kubectl get namespace "$TILLER_NAMESPACE" || kubectl create namespace "$TILLER_NAMESPACE" - gitlab-managed-apps /usr/local/share/gitlab-managed-apps/helmfile.yaml only: refs: diff --git a/spec/frontend/admin/statistics_panel/components/app_spec.js b/spec/frontend/admin/statistics_panel/components/app_spec.js index eba61949f8e..dda0c2b857c 100644 --- a/spec/frontend/admin/statistics_panel/components/app_spec.js +++ b/spec/frontend/admin/statistics_panel/components/app_spec.js @@ -21,7 +21,6 @@ describe('Admin statistics app', () => { wrapper = shallowMount(StatisticsPanelApp, { localVue, store, - sync: false, }); }; diff --git a/spec/frontend/boards/components/issue_time_estimate_spec.js b/spec/frontend/boards/components/issue_time_estimate_spec.js index 25e922931c3..162a6df828b 100644 --- a/spec/frontend/boards/components/issue_time_estimate_spec.js +++ b/spec/frontend/boards/components/issue_time_estimate_spec.js @@ -20,7 +20,6 @@ describe('Issue Time Estimate component', () => { propsData: { estimate: 374460, }, - sync: false, }); }); @@ -61,7 +60,6 @@ describe('Issue Time Estimate component', () => { propsData: { estimate: 374460, }, - sync: false, }); }); diff --git a/spec/frontend/boards/issue_card_spec.js b/spec/frontend/boards/issue_card_spec.js index 4a0a3497620..b9a88324763 100644 --- a/spec/frontend/boards/issue_card_spec.js +++ b/spec/frontend/boards/issue_card_spec.js @@ -50,7 +50,6 @@ describe('Issue card component', () => { rootPath: '/', }, store, - sync: false, attachToDocument: true, }); }); diff --git a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js index b5aead238ad..091d4e07987 100644 --- a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js +++ b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js @@ -13,7 +13,6 @@ describe('Remove cluster confirmation modal', () => { clusterName: 'clusterName', ...props, }, - sync: false, }); }; diff --git a/spec/frontend/commit/commit_pipeline_status_component_spec.js b/spec/frontend/commit/commit_pipeline_status_component_spec.js index a2a6d405eab..9281d1d02a3 100644 --- a/spec/frontend/commit/commit_pipeline_status_component_spec.js +++ b/spec/frontend/commit/commit_pipeline_status_component_spec.js @@ -33,7 +33,6 @@ describe('Commit pipeline status component', () => { ...defaultProps, ...props, }, - sync: false, }); }; diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js index d6a752d761d..57ef74f0119 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js @@ -28,7 +28,6 @@ const createComponent = (store, propsData = componentConfig) => propsData, store, localVue, - sync: false, }); const createStore = (initialState = {}, getters = {}) => diff --git a/spec/frontend/cycle_analytics/limit_warning_component_spec.js b/spec/frontend/cycle_analytics/limit_warning_component_spec.js index 5041ebe1a8b..a4606099b06 100644 --- a/spec/frontend/cycle_analytics/limit_warning_component_spec.js +++ b/spec/frontend/cycle_analytics/limit_warning_component_spec.js @@ -10,7 +10,6 @@ const createComponent = props => propsData: { ...props, }, - sync: false, attachToDocument: true, }); diff --git a/spec/frontend/diffs/components/compare_versions_spec.js b/spec/frontend/diffs/components/compare_versions_spec.js index dcce6f1fa7a..82088182a06 100644 --- a/spec/frontend/diffs/components/compare_versions_spec.js +++ b/spec/frontend/diffs/components/compare_versions_spec.js @@ -22,7 +22,6 @@ describe('CompareVersions', () => { store.state.diffs.diffFiles.push('test'); wrapper = mount(CompareVersionsComponent, { - sync: false, attachToDocument: true, localVue, store, diff --git a/spec/frontend/diffs/components/diff_content_spec.js b/spec/frontend/diffs/components/diff_content_spec.js index b0dd25f746b..979c67787f7 100644 --- a/spec/frontend/diffs/components/diff_content_spec.js +++ b/spec/frontend/diffs/components/diff_content_spec.js @@ -84,7 +84,6 @@ describe('DiffContent', () => { }, localVue, store: fakeStore, - sync: false, }); }; diff --git a/spec/frontend/diffs/components/diff_discussion_reply_spec.js b/spec/frontend/diffs/components/diff_discussion_reply_spec.js index 28689ab07de..9443a441ec2 100644 --- a/spec/frontend/diffs/components/diff_discussion_reply_spec.js +++ b/spec/frontend/diffs/components/diff_discussion_reply_spec.js @@ -16,7 +16,6 @@ describe('DiffDiscussionReply', () => { wrapper = shallowMount(DiffDiscussionReply, { store, localVue, - sync: false, propsData: { ...props, }, diff --git a/spec/frontend/diffs/components/diff_file_header_spec.js b/spec/frontend/diffs/components/diff_file_header_spec.js index 4f6e771aec8..19776b00194 100644 --- a/spec/frontend/diffs/components/diff_file_header_spec.js +++ b/spec/frontend/diffs/components/diff_file_header_spec.js @@ -91,7 +91,6 @@ describe('DiffFileHeader component', () => { }, localVue, store, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/diffs/components/diff_gutter_avatars_spec.js b/spec/frontend/diffs/components/diff_gutter_avatars_spec.js index 6ad33c36b30..38bfa44e6d4 100644 --- a/spec/frontend/diffs/components/diff_gutter_avatars_spec.js +++ b/spec/frontend/diffs/components/diff_gutter_avatars_spec.js @@ -16,7 +16,6 @@ describe('DiffGutterAvatars', () => { propsData: { ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/diffs/components/edit_button_spec.js b/spec/frontend/diffs/components/edit_button_spec.js index 9bcb23f3cbf..ccab386169a 100644 --- a/spec/frontend/diffs/components/edit_button_spec.js +++ b/spec/frontend/diffs/components/edit_button_spec.js @@ -9,7 +9,6 @@ describe('EditButton', () => { const createComponent = (props = {}) => { wrapper = shallowMount(EditButton, { propsData: { ...props }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/diffs/components/hidden_files_warning_spec.js b/spec/frontend/diffs/components/hidden_files_warning_spec.js index 164ff95de6d..6fb4e4645f8 100644 --- a/spec/frontend/diffs/components/hidden_files_warning_spec.js +++ b/spec/frontend/diffs/components/hidden_files_warning_spec.js @@ -13,7 +13,6 @@ describe('HiddenFilesWarning', () => { const createComponent = () => { wrapper = shallowMount(HiddenFilesWarning, { - sync: false, propsData, }); }; diff --git a/spec/frontend/diffs/components/settings_dropdown_spec.js b/spec/frontend/diffs/components/settings_dropdown_spec.js index 6aed445ad71..2e95d79ea49 100644 --- a/spec/frontend/diffs/components/settings_dropdown_spec.js +++ b/spec/frontend/diffs/components/settings_dropdown_spec.js @@ -28,7 +28,6 @@ describe('Diff settiings dropdown component', () => { vm = mount(SettingsDropdown, { localVue, store, - sync: false, }); } diff --git a/spec/frontend/environments/environment_monitoring_spec.js b/spec/frontend/environments/environment_monitoring_spec.js index 22241d5120b..9dea02ff66a 100644 --- a/spec/frontend/environments/environment_monitoring_spec.js +++ b/spec/frontend/environments/environment_monitoring_spec.js @@ -9,7 +9,6 @@ describe('Monitoring Component', () => { const createWrapper = () => { wrapper = shallowMount(MonitoringComponent, { - sync: false, attachToDocument: true, propsData: { monitoringUrl, diff --git a/spec/frontend/environments/environment_rollback_spec.js b/spec/frontend/environments/environment_rollback_spec.js index 33e04f5eb29..a165e94016e 100644 --- a/spec/frontend/environments/environment_rollback_spec.js +++ b/spec/frontend/environments/environment_rollback_spec.js @@ -14,7 +14,6 @@ describe('Rollback Component', () => { environment: {}, }, attachToDocument: true, - sync: false, }); expect(wrapper.element).toHaveSpriteIcon('repeat'); @@ -28,7 +27,6 @@ describe('Rollback Component', () => { environment: {}, }, attachToDocument: true, - sync: false, }); expect(wrapper.element).toHaveSpriteIcon('redo'); diff --git a/spec/frontend/environments/environment_stop_spec.js b/spec/frontend/environments/environment_stop_spec.js index be029d48a56..0b9b3078a09 100644 --- a/spec/frontend/environments/environment_stop_spec.js +++ b/spec/frontend/environments/environment_stop_spec.js @@ -11,7 +11,6 @@ describe('Stop Component', () => { const createWrapper = () => { wrapper = shallowMount(StopComponent, { - sync: false, attachToDocument: true, propsData: { environment: {}, diff --git a/spec/frontend/environments/environment_terminal_button_spec.js b/spec/frontend/environments/environment_terminal_button_spec.js index 058940c0e98..c890334c484 100644 --- a/spec/frontend/environments/environment_terminal_button_spec.js +++ b/spec/frontend/environments/environment_terminal_button_spec.js @@ -7,7 +7,6 @@ describe('Stop Component', () => { const mountWithProps = props => { wrapper = shallowMount(TerminalComponent, { - sync: false, attachToDocument: true, propsData: props, }); diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js index 66104724163..a747e07d70d 100644 --- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js +++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js @@ -29,7 +29,6 @@ describe('ErrorTrackingList', () => { wrapper = mount(ErrorTrackingList, { localVue, store, - sync: false, propsData: { indexPath: '/path', enableErrorTrackingLink: '/link', diff --git a/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js b/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js index b708fd4cf68..204bbfb9c2f 100644 --- a/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js +++ b/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js @@ -5,7 +5,6 @@ import eventHub from '~/frequent_items/event_hub'; const createComponent = (namespace = 'projects') => shallowMount(searchComponent, { propsData: { namespace }, - sync: false, }); describe('FrequentItemsSearchInputComponent', () => { diff --git a/spec/frontend/ide/components/branches/search_list_spec.js b/spec/frontend/ide/components/branches/search_list_spec.js index d26dfc48ff8..fe142d70698 100644 --- a/spec/frontend/ide/components/branches/search_list_spec.js +++ b/spec/frontend/ide/components/branches/search_list_spec.js @@ -33,7 +33,6 @@ describe('IDE branches search list', () => { wrapper = shallowMount(List, { localVue, store: fakeStore, - sync: false, }); }; diff --git a/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js b/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js index ad69984fd35..054e7492429 100644 --- a/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js @@ -23,7 +23,6 @@ describe('IDE commit editor header', () => { wrapper = mount(EditorHeader, { store, localVue, - sync: false, propsData: { activeFile: f, }, diff --git a/spec/frontend/ide/components/error_message_spec.js b/spec/frontend/ide/components/error_message_spec.js index db29413af24..1de496ba3f8 100644 --- a/spec/frontend/ide/components/error_message_spec.js +++ b/spec/frontend/ide/components/error_message_spec.js @@ -26,7 +26,6 @@ describe('IDE error message component', () => { }, store: fakeStore, localVue, - sync: false, }); }; diff --git a/spec/frontend/ide/components/file_templates/dropdown_spec.js b/spec/frontend/ide/components/file_templates/dropdown_spec.js index e107d3a364f..3cffbc3362f 100644 --- a/spec/frontend/ide/components/file_templates/dropdown_spec.js +++ b/spec/frontend/ide/components/file_templates/dropdown_spec.js @@ -45,7 +45,6 @@ describe('IDE file templates dropdown component', () => { }, store: fakeStore, localVue, - sync: false, }); ({ element } = wrapper); diff --git a/spec/frontend/ide/components/ide_status_list_spec.js b/spec/frontend/ide/components/ide_status_list_spec.js index e0574450101..2762adfb57d 100644 --- a/spec/frontend/ide/components/ide_status_list_spec.js +++ b/spec/frontend/ide/components/ide_status_list_spec.js @@ -27,7 +27,6 @@ describe('ide/components/ide_status_list', () => { wrapper = shallowMount(IdeStatusList, { localVue, - sync: false, store, ...options, }); diff --git a/spec/frontend/ide/components/jobs/list_spec.js b/spec/frontend/ide/components/jobs/list_spec.js index ec2e5b05048..d8880fa7cb7 100644 --- a/spec/frontend/ide/components/jobs/list_spec.js +++ b/spec/frontend/ide/components/jobs/list_spec.js @@ -44,7 +44,6 @@ describe('IDE stages list', () => { }, localVue, store, - sync: false, }); }; @@ -93,7 +92,6 @@ describe('IDE stages list', () => { wrapper = mount(StageList, { propsData: { ...defaultProps, stages }, store, - sync: false, localVue, }); }); diff --git a/spec/frontend/ide/components/jobs/stage_spec.js b/spec/frontend/ide/components/jobs/stage_spec.js index 400eabfee6d..3a47571ee13 100644 --- a/spec/frontend/ide/components/jobs/stage_spec.js +++ b/spec/frontend/ide/components/jobs/stage_spec.js @@ -26,7 +26,6 @@ describe('IDE pipeline stage', () => { ...defaultProps, ...props, }, - sync: false, }); }; diff --git a/spec/frontend/ide/components/merge_requests/list_spec.js b/spec/frontend/ide/components/merge_requests/list_spec.js index 76806dcba69..ae94ee4efa7 100644 --- a/spec/frontend/ide/components/merge_requests/list_spec.js +++ b/spec/frontend/ide/components/merge_requests/list_spec.js @@ -42,7 +42,6 @@ describe('IDE merge requests list', () => { wrapper = shallowMount(List, { store: fakeStore, localVue, - sync: false, }); }; diff --git a/spec/frontend/ide/components/pipelines/list_spec.js b/spec/frontend/ide/components/pipelines/list_spec.js index 91152dffafa..11e672b6685 100644 --- a/spec/frontend/ide/components/pipelines/list_spec.js +++ b/spec/frontend/ide/components/pipelines/list_spec.js @@ -63,7 +63,6 @@ describe('IDE pipelines list', () => { wrapper = shallowMount(List, { localVue, store: fakeStore, - sync: false, }); }; diff --git a/spec/frontend/ide/components/preview/clientside_spec.js b/spec/frontend/ide/components/preview/clientside_spec.js index 5cb9e598fc4..c7d5ea9c513 100644 --- a/spec/frontend/ide/components/preview/clientside_spec.js +++ b/spec/frontend/ide/components/preview/clientside_spec.js @@ -54,7 +54,6 @@ describe('IDE clientside preview', () => { }); wrapper = shallowMount(Clientside, { - sync: false, store, localVue, }); diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js index 4ec8f6b7dff..8ba7b554f43 100644 --- a/spec/frontend/ide/stores/actions/file_spec.js +++ b/spec/frontend/ide/stores/actions/file_spec.js @@ -9,6 +9,7 @@ import router from '~/ide/ide_router'; import eventHub from '~/ide/eventhub'; import { file } from '../../helpers'; +const ORIGINAL_CONTENT = 'original content'; const RELATIVE_URL_ROOT = '/gitlab'; describe('IDE store file actions', () => { @@ -583,6 +584,7 @@ describe('IDE store file actions', () => { tmpFile = file('tempFile'); tmpFile.content = 'testing'; + tmpFile.raw = ORIGINAL_CONTENT; store.state.changedFiles.push(tmpFile); store.state.entries[tmpFile.path] = tmpFile; @@ -594,7 +596,7 @@ describe('IDE store file actions', () => { store .dispatch('discardFileChanges', tmpFile.path) .then(() => { - expect(tmpFile.content).not.toBe('testing'); + expect(tmpFile.content).toBe(ORIGINAL_CONTENT); done(); }) @@ -624,22 +626,30 @@ describe('IDE store file actions', () => { expect(store.dispatch).toHaveBeenCalledWith('deleteEntry', tmpFile.path); }); - it('renames the file to its original name and closes it if it was open', () => { - Object.assign(tmpFile, { - prevPath: 'parentPath/old_name', - prevName: 'old_name', - prevParentPath: 'parentPath', - }); + describe('with renamed file', () => { + beforeEach(() => { + Object.assign(tmpFile, { + prevPath: 'parentPath/old_name', + prevName: 'old_name', + prevParentPath: 'parentPath', + }); - store.state.entries.parentPath = file('parentPath'); + store.state.entries.parentPath = file('parentPath'); - actions.discardFileChanges(store, tmpFile.path); + actions.discardFileChanges(store, tmpFile.path); + }); - expect(store.dispatch).toHaveBeenCalledWith('closeFile', tmpFile); - expect(store.dispatch).toHaveBeenCalledWith('renameEntry', { - path: 'tempFile', - name: 'old_name', - parentPath: 'parentPath', + it('renames the file to its original name and closes it if it was open', () => { + expect(store.dispatch).toHaveBeenCalledWith('closeFile', tmpFile); + expect(store.dispatch).toHaveBeenCalledWith('renameEntry', { + path: 'tempFile', + name: 'old_name', + parentPath: 'parentPath', + }); + }); + + it('resets file content', () => { + expect(tmpFile.content).toBe(ORIGINAL_CONTENT); }); }); diff --git a/spec/frontend/import_projects/components/import_projects_table_spec.js b/spec/frontend/import_projects/components/import_projects_table_spec.js index 708f2758083..deffe22ea77 100644 --- a/spec/frontend/import_projects/components/import_projects_table_spec.js +++ b/spec/frontend/import_projects/components/import_projects_table_spec.js @@ -45,7 +45,6 @@ describe('ImportProjectsTable', () => { propsData: { providerTitle, }, - sync: false, }); return component.vm; diff --git a/spec/frontend/import_projects/components/imported_project_table_row_spec.js b/spec/frontend/import_projects/components/imported_project_table_row_spec.js index 34961eae0f3..700dd1e025a 100644 --- a/spec/frontend/import_projects/components/imported_project_table_row_spec.js +++ b/spec/frontend/import_projects/components/imported_project_table_row_spec.js @@ -26,7 +26,6 @@ describe('ImportedProjectTableRow', () => { ...project, }, }, - sync: false, }); return component.vm; diff --git a/spec/frontend/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_projects/components/provider_repo_table_row_spec.js index 02c786d8d0b..8efd526e360 100644 --- a/spec/frontend/import_projects/components/provider_repo_table_row_spec.js +++ b/spec/frontend/import_projects/components/provider_repo_table_row_spec.js @@ -45,7 +45,6 @@ describe('ProviderRepoTableRow', () => { propsData: { repo, }, - sync: false, }); return component.vm; diff --git a/spec/frontend/issuable_suggestions/components/app_spec.js b/spec/frontend/issuable_suggestions/components/app_spec.js index 18fc4d146eb..7a2d2df78c4 100644 --- a/spec/frontend/issuable_suggestions/components/app_spec.js +++ b/spec/frontend/issuable_suggestions/components/app_spec.js @@ -11,7 +11,6 @@ describe('Issuable suggestions app component', () => { search, projectPath: 'project', }, - sync: false, attachToDocument: true, }); } diff --git a/spec/frontend/issuable_suggestions/components/item_spec.js b/spec/frontend/issuable_suggestions/components/item_spec.js index eeea8960658..4c89bb5fa81 100644 --- a/spec/frontend/issuable_suggestions/components/item_spec.js +++ b/spec/frontend/issuable_suggestions/components/item_spec.js @@ -16,7 +16,6 @@ describe('Issuable suggestions suggestion component', () => { ...suggestion, }, }, - sync: false, attachToDocument: true, }); } diff --git a/spec/frontend/issuables_list/components/issuable_spec.js b/spec/frontend/issuables_list/components/issuable_spec.js index 1822e7e3aac..b721fe61ace 100644 --- a/spec/frontend/issuables_list/components/issuable_spec.js +++ b/spec/frontend/issuables_list/components/issuable_spec.js @@ -44,7 +44,6 @@ describe('Issuable component', () => { baseUrl: TEST_BASE_URL, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/issuables_list/components/issuables_list_app_spec.js b/spec/frontend/issuables_list/components/issuables_list_app_spec.js index 4a2768b9389..3a01dc3a364 100644 --- a/spec/frontend/issuables_list/components/issuables_list_app_spec.js +++ b/spec/frontend/issuables_list/components/issuables_list_app_spec.js @@ -45,7 +45,6 @@ describe('Issuables list component', () => { emptySvgPath: TEST_EMPTY_SVG_PATH, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/issue_show/components/pinned_links_spec.js b/spec/frontend/issue_show/components/pinned_links_spec.js index bcc131d54c2..59c919c85d5 100644 --- a/spec/frontend/issue_show/components/pinned_links_spec.js +++ b/spec/frontend/issue_show/components/pinned_links_spec.js @@ -18,7 +18,6 @@ describe('PinnedLinks', () => { const createComponent = props => { wrapper = shallowMount(PinnedLinks, { - sync: false, propsData: { zoomMeetingUrl: null, ...props, diff --git a/spec/frontend/jobs/components/erased_block_spec.js b/spec/frontend/jobs/components/erased_block_spec.js index c7a53197fad..29a7676abe5 100644 --- a/spec/frontend/jobs/components/erased_block_spec.js +++ b/spec/frontend/jobs/components/erased_block_spec.js @@ -13,7 +13,6 @@ describe('Erased block', () => { const createComponent = props => { wrapper = mount(ErasedBlock, { propsData: props, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/jobs/components/log/collapsible_section_spec.js b/spec/frontend/jobs/components/log/collapsible_section_spec.js index 2a1f0bcf124..3a16521a986 100644 --- a/spec/frontend/jobs/components/log/collapsible_section_spec.js +++ b/spec/frontend/jobs/components/log/collapsible_section_spec.js @@ -12,7 +12,6 @@ describe('Job Log Collapsible Section', () => { const createComponent = (props = {}) => { wrapper = mount(CollpasibleSection, { - sync: true, propsData: { ...props, }, diff --git a/spec/frontend/jobs/components/log/duration_badge_spec.js b/spec/frontend/jobs/components/log/duration_badge_spec.js index 2ac34e78909..84dae386bdb 100644 --- a/spec/frontend/jobs/components/log/duration_badge_spec.js +++ b/spec/frontend/jobs/components/log/duration_badge_spec.js @@ -10,7 +10,6 @@ describe('Job Log Duration Badge', () => { const createComponent = (props = {}) => { wrapper = shallowMount(DurationBadge, { - sync: false, propsData: { ...props, }, diff --git a/spec/frontend/jobs/components/log/line_header_spec.js b/spec/frontend/jobs/components/log/line_header_spec.js index cc3f9111153..f2e202674ee 100644 --- a/spec/frontend/jobs/components/log/line_header_spec.js +++ b/spec/frontend/jobs/components/log/line_header_spec.js @@ -22,7 +22,6 @@ describe('Job Log Header Line', () => { const createComponent = (props = {}) => { wrapper = mount(LineHeader, { - sync: false, propsData: { ...props, }, diff --git a/spec/frontend/jobs/components/log/line_number_spec.js b/spec/frontend/jobs/components/log/line_number_spec.js index fcf2edf9159..96aa31baab9 100644 --- a/spec/frontend/jobs/components/log/line_number_spec.js +++ b/spec/frontend/jobs/components/log/line_number_spec.js @@ -11,7 +11,6 @@ describe('Job Log Line Number', () => { const createComponent = (props = {}) => { wrapper = shallowMount(LineNumber, { - sync: false, propsData: { ...props, }, diff --git a/spec/frontend/jobs/components/log/line_spec.js b/spec/frontend/jobs/components/log/line_spec.js index ea593e3c39a..ec3a3968f14 100644 --- a/spec/frontend/jobs/components/log/line_spec.js +++ b/spec/frontend/jobs/components/log/line_spec.js @@ -20,7 +20,6 @@ describe('Job Log Line', () => { const createComponent = (props = {}) => { wrapper = shallowMount(Line, { - sync: false, propsData: { ...props, }, diff --git a/spec/frontend/jobs/components/log/log_spec.js b/spec/frontend/jobs/components/log/log_spec.js index 7c834542a9a..02cdb31d27e 100644 --- a/spec/frontend/jobs/components/log/log_spec.js +++ b/spec/frontend/jobs/components/log/log_spec.js @@ -15,7 +15,6 @@ describe('Job Log', () => { const createComponent = () => { wrapper = mount(Log, { - sync: false, localVue, store, }); diff --git a/spec/frontend/monitoring/components/charts/anomaly_spec.js b/spec/frontend/monitoring/components/charts/anomaly_spec.js index 7446461a574..cea22d075ec 100644 --- a/spec/frontend/monitoring/components/charts/anomaly_spec.js +++ b/spec/frontend/monitoring/components/charts/anomaly_spec.js @@ -38,7 +38,6 @@ describe('Anomaly chart component', () => { slots: { default: mockWidgets, }, - sync: false, }); }; const findTimeSeries = () => wrapper.find(MonitorTimeSeriesChart); diff --git a/spec/frontend/monitoring/components/charts/column_spec.js b/spec/frontend/monitoring/components/charts/column_spec.js index 2f43c442600..d6a96ffbd65 100644 --- a/spec/frontend/monitoring/components/charts/column_spec.js +++ b/spec/frontend/monitoring/components/charts/column_spec.js @@ -32,7 +32,6 @@ describe('Column component', () => { }, containerWidth: 100, }, - sync: false, }); }); diff --git a/spec/frontend/monitoring/components/charts/empty_chart_spec.js b/spec/frontend/monitoring/components/charts/empty_chart_spec.js index c7f0627f151..bbfca27dc5a 100644 --- a/spec/frontend/monitoring/components/charts/empty_chart_spec.js +++ b/spec/frontend/monitoring/components/charts/empty_chart_spec.js @@ -10,7 +10,6 @@ describe('Empty Chart component', () => { propsData: { graphTitle, }, - sync: false, }); }); diff --git a/spec/frontend/monitoring/components/charts/single_stat_spec.js b/spec/frontend/monitoring/components/charts/single_stat_spec.js index dfea4eb41b1..2410dae112b 100644 --- a/spec/frontend/monitoring/components/charts/single_stat_spec.js +++ b/spec/frontend/monitoring/components/charts/single_stat_spec.js @@ -10,7 +10,6 @@ describe('Single Stat Chart component', () => { propsData: { graphData: graphDataPrometheusQuery, }, - sync: false, }); }); diff --git a/spec/frontend/monitoring/components/charts/time_series_spec.js b/spec/frontend/monitoring/components/charts/time_series_spec.js index 3a29ee12df8..12f83a07d23 100644 --- a/spec/frontend/monitoring/components/charts/time_series_spec.js +++ b/spec/frontend/monitoring/components/charts/time_series_spec.js @@ -58,7 +58,6 @@ describe('Time series component', () => { slots: { default: mockWidgets, }, - sync: false, store, attachToDocument: true, }); diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js index f77e8b61050..4caa66cf600 100644 --- a/spec/frontend/monitoring/components/dashboard_spec.js +++ b/spec/frontend/monitoring/components/dashboard_spec.js @@ -30,7 +30,6 @@ describe('Dashboard', () => { const createShallowWrapper = (props = {}, options = {}) => { wrapper = shallowMount(Dashboard, { localVue, - sync: false, propsData: { ...propsData, ...props }, store, ...options, @@ -40,7 +39,6 @@ describe('Dashboard', () => { const createMountedWrapper = (props = {}, options = {}) => { wrapper = mount(Dashboard, { localVue, - sync: false, propsData: { ...propsData, ...props }, store, ...options, diff --git a/spec/frontend/monitoring/components/dashboard_time_url_spec.js b/spec/frontend/monitoring/components/dashboard_time_url_spec.js index 747f07bcd0c..07b39c959be 100644 --- a/spec/frontend/monitoring/components/dashboard_time_url_spec.js +++ b/spec/frontend/monitoring/components/dashboard_time_url_spec.js @@ -19,7 +19,6 @@ describe('dashboard invalid url parameters', () => { const createMountedWrapper = (props = {}, options = {}) => { wrapper = mount(Dashboard, { - sync: false, propsData: { ...propsData, ...props }, store, ...options, diff --git a/spec/frontend/monitoring/components/dashboard_time_window_spec.js b/spec/frontend/monitoring/components/dashboard_time_window_spec.js index 658d3b68a76..c297b47eee0 100644 --- a/spec/frontend/monitoring/components/dashboard_time_window_spec.js +++ b/spec/frontend/monitoring/components/dashboard_time_window_spec.js @@ -24,7 +24,6 @@ describe('dashboard time window', () => { const createComponentWrapperMounted = (props = {}, options = {}) => { wrapper = mount(Dashboard, { - sync: false, propsData: { ...propsData, ...props }, store, ...options, diff --git a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js index 640f5f8fa33..9cac63ad725 100644 --- a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js +++ b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js @@ -15,7 +15,6 @@ describe('DateTimePickerInput', () => { label: '', ...propsData, }, - sync: false, }); }; diff --git a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js index ba40ced9545..180e41861f4 100644 --- a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js +++ b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js @@ -30,7 +30,6 @@ describe('DateTimePicker', () => { end, ...props, }, - sync: false, }); }; diff --git a/spec/frontend/monitoring/components/graph_group_spec.js b/spec/frontend/monitoring/components/graph_group_spec.js index edd08cdb4c9..983785d0ecc 100644 --- a/spec/frontend/monitoring/components/graph_group_spec.js +++ b/spec/frontend/monitoring/components/graph_group_spec.js @@ -12,7 +12,6 @@ describe('Graph group component', () => { const createComponent = propsData => { wrapper = shallowMount(GraphGroup, { propsData, - sync: false, }); }; diff --git a/spec/frontend/monitoring/panel_type_spec.js b/spec/frontend/monitoring/panel_type_spec.js index c869d77673e..04642d071aa 100644 --- a/spec/frontend/monitoring/panel_type_spec.js +++ b/spec/frontend/monitoring/panel_type_spec.js @@ -26,7 +26,6 @@ describe('Panel Type component', () => { ...props, }, store, - sync: false, attachToDocument: true, }); @@ -152,7 +151,6 @@ describe('Panel Type component', () => { graphData: graphDataPrometheusQueryRange, }, store, - sync: false, attachToDocument: true, }); panelType.vm.$nextTick(done); diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js index 7652f48474d..8f56b66350b 100644 --- a/spec/frontend/notes/components/comment_form_spec.js +++ b/spec/frontend/notes/components/comment_form_spec.js @@ -37,7 +37,6 @@ describe('issue_comment_form component', () => { noteableType, }, store, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/notes/components/diff_discussion_header_spec.js b/spec/frontend/notes/components/diff_discussion_header_spec.js index e461ea9d9d3..4c76f9c50fb 100644 --- a/spec/frontend/notes/components/diff_discussion_header_spec.js +++ b/spec/frontend/notes/components/diff_discussion_header_spec.js @@ -21,7 +21,6 @@ describe('diff_discussion_header component', () => { wrapper = mount(diffDiscussionHeader, { store, propsData: { discussion: discussionMock }, - sync: false, }); }); diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js index 1aea6b97172..7e30e166d65 100644 --- a/spec/frontend/notes/components/discussion_actions_spec.js +++ b/spec/frontend/notes/components/discussion_actions_spec.js @@ -35,7 +35,6 @@ describe('DiscussionActions', () => { shouldShowJumpToNextDiscussion: true, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js index 57ccd687fbe..a2ef477b5d2 100644 --- a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js +++ b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js @@ -6,7 +6,6 @@ describe('JumpToNextDiscussionButton', () => { beforeEach(() => { wrapper = shallowMount(JumpToNextDiscussionButton, { - sync: false, attachToDocument: true, }); }); diff --git a/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js b/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js index 0d6720e26e1..8d5ea108b50 100644 --- a/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js +++ b/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js @@ -16,7 +16,6 @@ describe('DiscussionNotesRepliesWrapper', () => { const createComponent = (props = {}) => { wrapper = mount(TestComponent, { propsData: props, - sync: false, }); }; diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js index a937aa171f3..1c004e5558e 100644 --- a/spec/frontend/notes/components/discussion_notes_spec.js +++ b/spec/frontend/notes/components/discussion_notes_spec.js @@ -31,7 +31,6 @@ describe('DiscussionNotes', () => { slots: { 'avatar-badge': '<span class="avatar-badge-slot-content" />', }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/notes/components/note_app_spec.js b/spec/frontend/notes/components/note_app_spec.js index b7e7d7d1d72..76ed8134411 100644 --- a/spec/frontend/notes/components/note_app_spec.js +++ b/spec/frontend/notes/components/note_app_spec.js @@ -62,7 +62,6 @@ describe('note_app', () => { attachToDocument: true, propsData, store, - sync: false, }, ); }; diff --git a/spec/frontend/notes/components/note_edited_text_spec.js b/spec/frontend/notes/components/note_edited_text_spec.js index 8d05e8a3c31..4671bc6629c 100644 --- a/spec/frontend/notes/components/note_edited_text_spec.js +++ b/spec/frontend/notes/components/note_edited_text_spec.js @@ -21,7 +21,6 @@ describe('NoteEditedText', () => { beforeEach(() => { wrapper = shallowMount(NoteEditedText, { propsData, - sync: false, attachToDocument: true, }); }); diff --git a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js index 3efebc69011..3efefa8137f 100644 --- a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js +++ b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js @@ -48,7 +48,6 @@ describe('User Operation confirmation modal', () => { stubs: { GlModal: ModalStub, }, - sync: false, }); }; diff --git a/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js b/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js index f1b4c370532..3d615d9d05f 100644 --- a/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js +++ b/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js @@ -29,7 +29,6 @@ describe('Users admin page Modal Manager', () => { csrfToken: 'dummyCSRF', ...props, }, - sync: false, }); }; diff --git a/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js b/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js index 0ecdae2618c..f3a37a255cd 100644 --- a/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js +++ b/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js @@ -17,7 +17,6 @@ describe('User Operation confirmation modal', () => { method: 'method', ...props, }, - sync: false, }); }; diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js index a7e504af231..cbb1de4d87a 100644 --- a/spec/frontend/pipelines/graph/action_component_spec.js +++ b/spec/frontend/pipelines/graph/action_component_spec.js @@ -19,7 +19,6 @@ describe('pipeline graph action component', () => { link: 'foo', actionIcon: 'cancel', }, - sync: false, attachToDocument: true, }); }); diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js index 22e1881ead4..abeb538e390 100644 --- a/spec/frontend/pipelines/graph/job_item_spec.js +++ b/spec/frontend/pipelines/graph/job_item_spec.js @@ -6,7 +6,10 @@ describe('pipeline graph job item', () => { let wrapper; const createWrapper = propsData => { - wrapper = mount(JobItem, { sync: false, attachToDocument: true, propsData }); + wrapper = mount(JobItem, { + attachToDocument: true, + propsData, + }); }; const delayedJobFixture = getJSONFixture('jobs/delayed.json'); diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js index b5fb1a94ebd..8cd9cb7e95d 100644 --- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js @@ -19,7 +19,6 @@ describe('Linked pipeline', () => { beforeEach(() => { wrapper = mount(LinkedPipelineComponent, { - sync: false, attachToDocument: true, propsData: props, }); @@ -83,7 +82,6 @@ describe('Linked pipeline', () => { beforeEach(() => { wrapper = mount(LinkedPipelineComponent, { - sync: false, attachToDocument: true, propsData: props, }); @@ -101,7 +99,6 @@ describe('Linked pipeline', () => { beforeEach(() => { wrapper = mount(LinkedPipelineComponent, { - sync: false, attachToDocument: true, propsData: props, }); diff --git a/spec/frontend/pipelines/pipeline_triggerer_spec.js b/spec/frontend/pipelines/pipeline_triggerer_spec.js index e211852f74b..b633d711699 100644 --- a/spec/frontend/pipelines/pipeline_triggerer_spec.js +++ b/spec/frontend/pipelines/pipeline_triggerer_spec.js @@ -24,7 +24,6 @@ describe('Pipelines Triggerer', () => { const createComponent = () => { wrapper = shallowMount(pipelineTriggerer, { propsData: mockData, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js index 0bb5ff159c5..6587cc8b318 100644 --- a/spec/frontend/pipelines/pipeline_url_spec.js +++ b/spec/frontend/pipelines/pipeline_url_spec.js @@ -10,7 +10,6 @@ describe('Pipeline Url Component', () => { const createComponent = props => { wrapper = shallowMount(PipelineUrlComponent, { - sync: false, attachToDocument: true, propsData: props, }); diff --git a/spec/frontend/pipelines/pipelines_table_row_spec.js b/spec/frontend/pipelines/pipelines_table_row_spec.js index 1c785ec6ffe..c43210c5350 100644 --- a/spec/frontend/pipelines/pipelines_table_row_spec.js +++ b/spec/frontend/pipelines/pipelines_table_row_spec.js @@ -12,7 +12,6 @@ describe('Pipelines Table Row', () => { autoDevopsHelpPath: 'foo', viewType: 'root', }, - sync: false, }); let wrapper; diff --git a/spec/frontend/registry/list/components/app_spec.js b/spec/frontend/registry/list/components/app_spec.js index ac95c4dddcf..7797f41a4b5 100644 --- a/spec/frontend/registry/list/components/app_spec.js +++ b/spec/frontend/registry/list/components/app_spec.js @@ -62,7 +62,6 @@ describe('Registry List', () => { beforeEach(() => { wrapper = mount(registry, { attachToDocument: true, - sync: false, propsData, computed: { repos() { diff --git a/spec/frontend/registry/list/components/project_empty_state_spec.js b/spec/frontend/registry/list/components/project_empty_state_spec.js index bd717a4eb10..0194abe6642 100644 --- a/spec/frontend/registry/list/components/project_empty_state_spec.js +++ b/spec/frontend/registry/list/components/project_empty_state_spec.js @@ -7,7 +7,6 @@ describe('Registry Project Empty state', () => { beforeEach(() => { wrapper = mount(projectEmptyState, { attachToDocument: true, - sync: false, propsData: { noContainersImage: 'imageUrl', helpPagePath: 'help', diff --git a/spec/frontend/registry/settings/components/registry_settings_app_spec.js b/spec/frontend/registry/settings/components/registry_settings_app_spec.js index e0fe6172064..448ff2b3be9 100644 --- a/spec/frontend/registry/settings/components/registry_settings_app_spec.js +++ b/spec/frontend/registry/settings/components/registry_settings_app_spec.js @@ -17,7 +17,6 @@ describe('Registry Settings App', () => { const mountComponent = (options = {}) => { fetchSpy = jest.fn(); wrapper = shallowMount(component, { - sync: false, store, methods: { fetchSettings: fetchSpy, diff --git a/spec/frontend/registry/settings/components/settings_form_spec.js b/spec/frontend/registry/settings/components/settings_form_spec.js index f93a5b9fb6d..b944e5a2cea 100644 --- a/spec/frontend/registry/settings/components/settings_form_spec.js +++ b/spec/frontend/registry/settings/components/settings_form_spec.js @@ -24,7 +24,6 @@ describe('Settings Form', () => { saveSpy = jest.fn(); resetSpy = jest.fn(); wrapper = shallowMount(component, { - sync: false, store, methods: { saveSettings: saveSpy, diff --git a/spec/frontend/releases/detail/components/app_spec.js b/spec/frontend/releases/detail/components/app_spec.js index 4f094e8639a..09f348018f4 100644 --- a/spec/frontend/releases/detail/components/app_spec.js +++ b/spec/frontend/releases/detail/components/app_spec.js @@ -29,7 +29,10 @@ describe('Release detail component', () => { const store = new Vuex.Store({ actions, state }); - wrapper = mount(ReleaseDetailApp, { store, sync: false, attachToDocument: true }); + wrapper = mount(ReleaseDetailApp, { + store, + attachToDocument: true, + }); return wrapper.vm.$nextTick(); }); diff --git a/spec/frontend/releases/list/components/release_block_footer_spec.js b/spec/frontend/releases/list/components/release_block_footer_spec.js index 7652acbdd62..07f61303e33 100644 --- a/spec/frontend/releases/list/components/release_block_footer_spec.js +++ b/spec/frontend/releases/list/components/release_block_footer_spec.js @@ -27,7 +27,6 @@ describe('Release block footer', () => { ...convertObjectPropsToCamelCase(releaseClone), ...props, }, - sync: false, }); return wrapper.vm.$nextTick(); diff --git a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js index a52bd8a34b2..8a63dbbdca7 100644 --- a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js +++ b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js @@ -14,7 +14,6 @@ describe('Release block milestone info', () => { propsData: { milestones: milestonesProp, }, - sync: false, }); return wrapper.vm.$nextTick(); diff --git a/spec/frontend/releases/list/components/release_block_spec.js b/spec/frontend/releases/list/components/release_block_spec.js index 89691a83414..e3d6af13417 100644 --- a/spec/frontend/releases/list/components/release_block_spec.js +++ b/spec/frontend/releases/list/components/release_block_spec.js @@ -34,7 +34,6 @@ describe('Release block', () => { ...featureFlags, }, }, - sync: false, }); return wrapper.vm.$nextTick(); diff --git a/spec/frontend/serverless/components/area_spec.js b/spec/frontend/serverless/components/area_spec.js index 62005e1981a..8b6f664ae25 100644 --- a/spec/frontend/serverless/components/area_spec.js +++ b/spec/frontend/serverless/components/area_spec.js @@ -16,7 +16,6 @@ describe('Area component', () => { slots: { default: mockWidgets, }, - sync: false, }); }); diff --git a/spec/frontend/serverless/components/environment_row_spec.js b/spec/frontend/serverless/components/environment_row_spec.js index 21637473e42..a59b4fdbb7b 100644 --- a/spec/frontend/serverless/components/environment_row_spec.js +++ b/spec/frontend/serverless/components/environment_row_spec.js @@ -5,7 +5,9 @@ import { mockServerlessFunctions, mockServerlessFunctionsDiffEnv } from '../mock import { translate } from '~/serverless/utils'; const createComponent = (env, envName) => - shallowMount(environmentRowComponent, { propsData: { env, envName }, sync: false }).vm; + shallowMount(environmentRowComponent, { + propsData: { env, envName }, + }).vm; describe('environment row component', () => { describe('default global cluster case', () => { diff --git a/spec/frontend/serverless/components/function_details_spec.js b/spec/frontend/serverless/components/function_details_spec.js index 27d3a43db27..40d2bbb0291 100644 --- a/spec/frontend/serverless/components/function_details_spec.js +++ b/spec/frontend/serverless/components/function_details_spec.js @@ -41,7 +41,6 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, - sync: false, }); expect( @@ -69,7 +68,6 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, - sync: false, }); expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('1 pod in use'); @@ -87,7 +85,6 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, - sync: false, }); expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('3 pods in use'); @@ -105,7 +102,6 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, - sync: false, }); expect( diff --git a/spec/frontend/serverless/components/function_row_spec.js b/spec/frontend/serverless/components/function_row_spec.js index 559c55a1eb4..76a9e149302 100644 --- a/spec/frontend/serverless/components/function_row_spec.js +++ b/spec/frontend/serverless/components/function_row_spec.js @@ -8,7 +8,9 @@ describe('functionRowComponent', () => { let wrapper; const createComponent = func => { - wrapper = shallowMount(functionRowComponent, { propsData: { func }, sync: false }); + wrapper = shallowMount(functionRowComponent, { + propsData: { func }, + }); }; afterEach(() => { diff --git a/spec/frontend/serverless/components/functions_spec.js b/spec/frontend/serverless/components/functions_spec.js index 29d35b5f1a6..8db04409357 100644 --- a/spec/frontend/serverless/components/functions_spec.js +++ b/spec/frontend/serverless/components/functions_spec.js @@ -43,7 +43,6 @@ describe('functionsComponent', () => { helpPath: '', statusPath: '', }, - sync: false, }); expect(component.find(EmptyState).exists()).toBe(true); @@ -59,7 +58,6 @@ describe('functionsComponent', () => { helpPath: '', statusPath: '', }, - sync: false, }); expect(component.find(GlLoadingIcon).exists()).toBe(true); @@ -75,7 +73,6 @@ describe('functionsComponent', () => { helpPath: '', statusPath: '', }, - sync: false, }); expect( @@ -102,7 +99,6 @@ describe('functionsComponent', () => { helpPath: '', statusPath: '', }, - sync: false, }); expect(component.find('.js-functions-wrapper').exists()).toBe(true); @@ -118,7 +114,6 @@ describe('functionsComponent', () => { helpPath: 'helpPath', statusPath, }, - sync: false, }); component.vm.$store.dispatch('receiveFunctionsSuccess', mockServerlessFunctions); diff --git a/spec/frontend/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js index 908f534b847..896dc5b43e1 100644 --- a/spec/frontend/serverless/components/missing_prometheus_spec.js +++ b/spec/frontend/serverless/components/missing_prometheus_spec.js @@ -9,7 +9,6 @@ const createComponent = missingData => helpPath: '/help', missingData, }, - sync: false, }); describe('missingPrometheusComponent', () => { diff --git a/spec/frontend/serverless/components/pod_box_spec.js b/spec/frontend/serverless/components/pod_box_spec.js index 8563d29c56b..495d11bd9ec 100644 --- a/spec/frontend/serverless/components/pod_box_spec.js +++ b/spec/frontend/serverless/components/pod_box_spec.js @@ -6,7 +6,6 @@ const createComponent = count => propsData: { count, }, - sync: false, }).vm; describe('podBoxComponent', () => { diff --git a/spec/frontend/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js index 9b15df20a89..36dc9e73c74 100644 --- a/spec/frontend/serverless/components/url_spec.js +++ b/spec/frontend/serverless/components/url_spec.js @@ -8,7 +8,6 @@ const createComponent = uri => propsData: { uri, }, - sync: false, }); describe('urlComponent', () => { diff --git a/spec/frontend/sidebar/assignees_spec.js b/spec/frontend/sidebar/assignees_spec.js index e29f405adbd..fcd08dc2dc7 100644 --- a/spec/frontend/sidebar/assignees_spec.js +++ b/spec/frontend/sidebar/assignees_spec.js @@ -15,7 +15,6 @@ describe('Assignee component', () => { const createWrapper = (propsData = getDefaultProps()) => { wrapper = mount(Assignee, { propsData, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js index 5f2b00eaa23..8d57fd94eb5 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js @@ -25,7 +25,6 @@ describe('AssigneeAvatarLink component', () => { wrapper = shallowMount(AssigneeAvatarLink, { attachToDocument: true, propsData, - sync: false, }); } diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js index e925da0e4c2..7df37d11987 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js @@ -20,7 +20,6 @@ describe('AssigneeAvatar', () => { wrapper = shallowMount(AssigneeAvatar, { propsData, - sync: false, }); } diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js index 4479b180b65..a303e5f493e 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js @@ -18,7 +18,6 @@ describe('CollapsedAssigneeList component', () => { wrapper = shallowMount(CollapsedAssigneeList, { attachToDocument: true, propsData, - sync: false, }); } diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js index f9ca7bc1ecb..49a6d9e8ae6 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js @@ -18,7 +18,6 @@ describe('CollapsedAssignee assignee component', () => { wrapper = shallowMount(CollapsedAssignee, { propsData, - sync: false, }); } diff --git a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js index 8381cc25db4..6d8e62404e0 100644 --- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js @@ -19,7 +19,6 @@ describe('UncollapsedAssigneeList component', () => { wrapper = mount(UncollapsedAssigneeList, { attachToDocument: true, - sync: false, propsData, }); } diff --git a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js index 92c5dc242ee..13b7c426366 100644 --- a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js +++ b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js @@ -37,7 +37,6 @@ describe('Confidential Issue Sidebar Block', () => { service, ...propsData, }, - sync: false, }); }; diff --git a/spec/frontend/sidebar/todo_spec.js b/spec/frontend/sidebar/todo_spec.js index 0b323a0c7ef..18b621cd12d 100644 --- a/spec/frontend/sidebar/todo_spec.js +++ b/spec/frontend/sidebar/todo_spec.js @@ -14,7 +14,6 @@ describe('SidebarTodo', () => { const createComponent = (props = {}) => { wrapper = shallowMount(SidebarTodos, { - sync: false, propsData: { ...defaultProps, ...props, diff --git a/spec/frontend/snippets/components/app_spec.js b/spec/frontend/snippets/components/app_spec.js index 903290716cc..6576e5b075f 100644 --- a/spec/frontend/snippets/components/app_spec.js +++ b/spec/frontend/snippets/components/app_spec.js @@ -20,7 +20,6 @@ describe('Snippet view app', () => { }; wrapper = shallowMount(SnippetApp, { - sync: false, mocks: { $apollo }, propsData: { ...props, diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js index fce1628aab0..5cf20119189 100644 --- a/spec/frontend/snippets/components/snippet_header_spec.js +++ b/spec/frontend/snippets/components/snippet_header_spec.js @@ -61,7 +61,6 @@ describe('Snippet header component', () => { }; wrapper = shallowMount(SnippetHeader, { - sync: false, mocks: { $apollo }, propsData: { ...defaultProps, diff --git a/spec/frontend/snippets/components/snippet_title_spec.js b/spec/frontend/snippets/components/snippet_title_spec.js index fb2193b26b0..a7efa4ae341 100644 --- a/spec/frontend/snippets/components/snippet_title_spec.js +++ b/spec/frontend/snippets/components/snippet_title_spec.js @@ -17,7 +17,6 @@ describe('Snippet header component', () => { const defaultProps = Object.assign({}, props); wrapper = shallowMount(SnippetTitle, { - sync: false, propsData: { ...defaultProps, }, diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js index adada264865..1401308f7f0 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js @@ -38,7 +38,6 @@ describe('Merge Requests Artifacts list app', () => { ...actionSpies, }, localVue, - sync: false, }); }; diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js index ab701775a7c..1b1624e3e8f 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js @@ -15,7 +15,6 @@ describe('Artifacts List', () => { propsData: { ...props, }, - sync: false, }); }; diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js index 662b1160b0c..cee0b9b0118 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js @@ -12,7 +12,6 @@ describe('MrWidgetIcon', () => { propsData: { name: TEST_ICON, }, - sync: false, }); }); diff --git a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js index 9ee497036c7..5d09af50420 100644 --- a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js @@ -10,7 +10,6 @@ describe('Commits edit component', () => { const createComponent = (slots = {}) => { wrapper = shallowMount(CommitEdit, { - sync: false, propsData: { value: testCommitMessage, label: testLabel, diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js index 1f4d1e17ea0..98af44b0975 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js @@ -10,7 +10,6 @@ describe('MRWidgetAutoMergeFailed', () => { const createComponent = (props = {}) => { wrapper = shallowMount(AutoMergeFailedComponent, { - sync: false, propsData: { ...props }, }); }; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js index 1096d5b3fa7..56832f82b05 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js @@ -25,7 +25,6 @@ describe('Commits message dropdown component', () => { const createComponent = () => { wrapper = shallowMount(CommitMessageDropdown, { - sync: false, propsData: { commits, }, diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js index bc646d6dcd5..67746b062b9 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js @@ -7,7 +7,6 @@ describe('Commits header component', () => { const createComponent = props => { wrapper = shallowMount(CommitsHeader, { - sync: false, propsData: { isSquashEnabled: false, targetBranch: 'master', diff --git a/spec/frontend/vue_shared/components/changed_file_icon_spec.js b/spec/frontend/vue_shared/components/changed_file_icon_spec.js index 381d5dd289f..9197cb8bc00 100644 --- a/spec/frontend/vue_shared/components/changed_file_icon_spec.js +++ b/spec/frontend/vue_shared/components/changed_file_icon_spec.js @@ -18,7 +18,6 @@ describe('Changed file icon', () => { showTooltip: true, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/clipboard_button_spec.js b/spec/frontend/vue_shared/components/clipboard_button_spec.js index df66b90c26e..233088b8d32 100644 --- a/spec/frontend/vue_shared/components/clipboard_button_spec.js +++ b/spec/frontend/vue_shared/components/clipboard_button_spec.js @@ -9,7 +9,6 @@ describe('clipboard button', () => { const createWrapper = propsData => { wrapper = shallowMount(ClipboardButton, { propsData, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/commit_spec.js b/spec/frontend/vue_shared/components/commit_spec.js index 3607d4a0fd3..81c67b30a11 100644 --- a/spec/frontend/vue_shared/components/commit_spec.js +++ b/spec/frontend/vue_shared/components/commit_spec.js @@ -17,7 +17,6 @@ describe('Commit component', () => { const createComponent = propsData => { wrapper = shallowMount(CommitComponent, { propsData, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/file_icon_spec.js b/spec/frontend/vue_shared/components/file_icon_spec.js index f8f68a6a77a..7b7633a06d6 100644 --- a/spec/frontend/vue_shared/components/file_icon_spec.js +++ b/spec/frontend/vue_shared/components/file_icon_spec.js @@ -14,7 +14,6 @@ describe('File Icon component', () => { const createComponent = (props = {}) => { wrapper = shallowMount(FileIcon, { - sync: false, propsData: { ...props }, }); }; diff --git a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js index d9badffb50d..30afb044bbf 100644 --- a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js +++ b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js @@ -20,7 +20,6 @@ describe('GlToggleVuex component', () => { stateProperty: 'toggleState', ...props, }, - sync: false, }); }; diff --git a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js index 5271227d3cd..00245c68342 100644 --- a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js @@ -17,7 +17,6 @@ describe('IssueAssigneesComponent', () => { assignees: mockAssigneesList, ...props, }, - sync: false, attachToDocument: true, }); vm = wrapper.vm; // eslint-disable-line diff --git a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js index 4a66330ac30..ef752743fa9 100644 --- a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js @@ -13,7 +13,6 @@ const createComponent = (milestone = mockMilestone) => { propsData: { milestone, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js index 85cd90d2f8c..e895fe27095 100644 --- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js +++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js @@ -31,7 +31,6 @@ describe('RelatedIssuableItem', () => { beforeEach(() => { wrapper = mount(RelatedIssuableItem, { slots, - sync: false, attachToDocument: true, propsData: props, }); diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js index 7a05bf092f5..46e269e5071 100644 --- a/spec/frontend/vue_shared/components/markdown/field_spec.js +++ b/spec/frontend/vue_shared/components/markdown/field_spec.js @@ -37,7 +37,6 @@ function createComponent() { </textarea> </field-component> `, - sync: false, }); return wrapper; } diff --git a/spec/frontend/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js index 3dfd4cfc942..8eec48749c9 100644 --- a/spec/frontend/vue_shared/components/markdown/header_spec.js +++ b/spec/frontend/vue_shared/components/markdown/header_spec.js @@ -12,7 +12,6 @@ describe('Markdown field header component', () => { previewMarkdown: false, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js index 3d42c02ebb6..0450166a468 100644 --- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js +++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js @@ -17,7 +17,6 @@ describe('Suggestion Diff component', () => { ...DEFAULT_PROPS, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/modal_copy_button_spec.js b/spec/frontend/vue_shared/components/modal_copy_button_spec.js index a57655dd580..1c048560212 100644 --- a/spec/frontend/vue_shared/components/modal_copy_button_spec.js +++ b/spec/frontend/vue_shared/components/modal_copy_button_spec.js @@ -17,7 +17,6 @@ describe('modal copy button', () => { title: 'Copy this value', }, attachToDocument: true, - sync: false, }); }); diff --git a/spec/frontend/vue_shared/components/notes/system_note_spec.js b/spec/frontend/vue_shared/components/notes/system_note_spec.js index 080dd778e29..91b68ce1c6f 100644 --- a/spec/frontend/vue_shared/components/notes/system_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js @@ -34,7 +34,6 @@ describe('system note component', () => { store, propsData: props, attachToDocument: true, - sync: false, }); }); diff --git a/spec/frontend/vue_shared/components/paginated_list_spec.js b/spec/frontend/vue_shared/components/paginated_list_spec.js index 4e1b29a4d3a..3b064410274 100644 --- a/spec/frontend/vue_shared/components/paginated_list_spec.js +++ b/spec/frontend/vue_shared/components/paginated_list_spec.js @@ -27,7 +27,6 @@ describe('Pagination links component', () => { props, }, attachToDocument: true, - sync: false, }); [glPaginatedList] = wrapper.vm.$children; diff --git a/spec/frontend/vue_shared/components/pagination_links_spec.js b/spec/frontend/vue_shared/components/pagination_links_spec.js index 3c53cda45f5..bf004c83c4f 100644 --- a/spec/frontend/vue_shared/components/pagination_links_spec.js +++ b/spec/frontend/vue_shared/components/pagination_links_spec.js @@ -36,7 +36,6 @@ describe('Pagination links component', () => { change: changeMock, pageInfo, }, - sync: false, }); }; diff --git a/spec/frontend/vue_shared/components/recaptcha_modal_spec.js b/spec/frontend/vue_shared/components/recaptcha_modal_spec.js index e509fe09d94..223e7187d99 100644 --- a/spec/frontend/vue_shared/components/recaptcha_modal_spec.js +++ b/spec/frontend/vue_shared/components/recaptcha_modal_spec.js @@ -14,7 +14,6 @@ describe('RecaptchaModal', () => { beforeEach(() => { wrapper = shallowMount(RecaptchaModal, { - sync: false, propsData: { html: recaptchaHtml, }, diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js index da22034a8db..7dd1be24360 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js @@ -12,7 +12,6 @@ import { const createComponent = (config = mockConfig) => shallowMount(BaseComponent, { propsData: config, - sync: false, attachToDocument: true, }); diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js index 52c0298603d..76f6ff96f82 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js @@ -25,7 +25,6 @@ const createComponent = ( enableScopedLabels: true, }, attachToDocument: true, - sync: false, }); }; diff --git a/spec/frontend/vue_shared/components/slot_switch_spec.js b/spec/frontend/vue_shared/components/slot_switch_spec.js index cff955c05b2..71e6087c272 100644 --- a/spec/frontend/vue_shared/components/slot_switch_spec.js +++ b/spec/frontend/vue_shared/components/slot_switch_spec.js @@ -14,7 +14,6 @@ describe('SlotSwitch', () => { wrapper = shallowMount(SlotSwitch, { propsData, slots, - sync: false, }); }; diff --git a/spec/frontend/vue_shared/components/split_button_spec.js b/spec/frontend/vue_shared/components/split_button_spec.js index 520abb02cf7..91facb7afa4 100644 --- a/spec/frontend/vue_shared/components/split_button_spec.js +++ b/spec/frontend/vue_shared/components/split_button_spec.js @@ -22,7 +22,6 @@ describe('SplitButton', () => { const createComponent = propsData => { wrapper = shallowMount(SplitButton, { propsData, - sync: false, }); }; diff --git a/spec/frontend/vue_shared/components/table_pagination_spec.js b/spec/frontend/vue_shared/components/table_pagination_spec.js index 8105d1fcef3..56ffffc7f0f 100644 --- a/spec/frontend/vue_shared/components/table_pagination_spec.js +++ b/spec/frontend/vue_shared/components/table_pagination_spec.js @@ -8,7 +8,6 @@ describe('Pagination component', () => { const mountComponent = props => { wrapper = shallowMount(TablePagination, { - sync: false, propsData: props, }); }; diff --git a/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js b/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js index 49591c3ce1c..a1db72c9c73 100644 --- a/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js +++ b/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js @@ -8,7 +8,6 @@ describe('Time ago with tooltip component', () => { const buildVm = (propsData = {}) => { vm = shallowMount(TimeAgoTooltip, { attachToDocument: true, - sync: false, propsData, }); }; diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js index 03bb88d1486..663d0af4cc4 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js @@ -27,7 +27,6 @@ describe('User Avatar Image Component', () => { propsData: { ...DEFAULT_PROPS, }, - sync: false, }); }); @@ -54,7 +53,6 @@ describe('User Avatar Image Component', () => { ...DEFAULT_PROPS, lazy: true, }, - sync: false, }); }); @@ -69,7 +67,7 @@ describe('User Avatar Image Component', () => { describe('Initialization without src', () => { beforeEach(() => { - wrapper = shallowMount(UserAvatarImage, { sync: false }); + wrapper = shallowMount(UserAvatarImage); }); it('should have default avatar image', () => { @@ -86,7 +84,10 @@ describe('User Avatar Image Component', () => { }; beforeEach(() => { - wrapper = shallowMount(UserAvatarImage, { propsData: { props }, slots, sync: false }); + wrapper = shallowMount(UserAvatarImage, { + propsData: { props }, + slots, + }); }); it('renders the tooltip slot', () => { diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js index 16993cc21c9..2bbbab17bce 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js @@ -26,7 +26,6 @@ describe('User Avatar Link Component', () => { ...defaultProps, ...props, }, - sync: false, attachToDocument: true, }); }; diff --git a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js index 440ad1ca40f..b1c9f8b505b 100644 --- a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js @@ -39,7 +39,6 @@ describe('User Popover Component', () => { target: findTarget(), ...props, }, - sync: false, ...options, }); }; diff --git a/spec/frontend/vue_shared/directives/track_event_spec.js b/spec/frontend/vue_shared/directives/track_event_spec.js index e1009e5079a..8d867c8e3fc 100644 --- a/spec/frontend/vue_shared/directives/track_event_spec.js +++ b/spec/frontend/vue_shared/directives/track_event_spec.js @@ -22,7 +22,7 @@ let button; describe('Error Tracking directive', () => { beforeEach(() => { - wrapper = shallowMount(Component, {}); + wrapper = shallowMount(Component); button = wrapper.find('#trackable'); }); diff --git a/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js b/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js index 8a3834d542f..df160d7a363 100644 --- a/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js +++ b/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js @@ -25,7 +25,6 @@ describe('CompareVersionsDropdown', () => { const createComponent = (props = {}) => { wrapper = shallowMount(localVue.extend(CompareVersionsDropdown), { localVue, - sync: false, propsData: { ...props }, }); }; diff --git a/spec/javascripts/diffs/components/diff_discussions_spec.js b/spec/javascripts/diffs/components/diff_discussions_spec.js index f7f0ab83c21..1b924bb947d 100644 --- a/spec/javascripts/diffs/components/diff_discussions_spec.js +++ b/spec/javascripts/diffs/components/diff_discussions_spec.js @@ -24,7 +24,6 @@ describe('DiffDiscussions', () => { ...props, }, localVue, - sync: false, }); }; 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 9bf3e02557f..e3f05e89a2d 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 @@ -18,7 +18,6 @@ describe('FrequentItemsListItemComponent', () => { avatarUrl: mockProject.avatarUrl, ...props, }, - sync: false, localVue, }); }; diff --git a/spec/javascripts/jobs/components/manual_variables_form_spec.js b/spec/javascripts/jobs/components/manual_variables_form_spec.js index 1f2bf8674c1..547f146cf88 100644 --- a/spec/javascripts/jobs/components/manual_variables_form_spec.js +++ b/spec/javascripts/jobs/components/manual_variables_form_spec.js @@ -20,7 +20,6 @@ describe('Manual Variables Form', () => { wrapper = shallowMount(localVue.extend(Form), { propsData: props, localVue, - sync: false, }); }; diff --git a/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js b/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js index 3be1f0be0d0..4348445f7ca 100644 --- a/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js +++ b/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js @@ -12,7 +12,6 @@ describe('ResolveWithIssueButton', () => { beforeEach(() => { wrapper = shallowMount(ResolveWithIssueButton, { localVue, - sync: false, propsData: { url, }, diff --git a/spec/javascripts/notes/components/note_actions/reply_button_spec.js b/spec/javascripts/notes/components/note_actions/reply_button_spec.js index aa39ab15833..720ab10b270 100644 --- a/spec/javascripts/notes/components/note_actions/reply_button_spec.js +++ b/spec/javascripts/notes/components/note_actions/reply_button_spec.js @@ -10,7 +10,6 @@ describe('ReplyButton', () => { beforeEach(() => { wrapper = mount(localVue.extend(ReplyButton), { - sync: false, localVue, }); }); diff --git a/spec/javascripts/notes/components/note_actions_spec.js b/spec/javascripts/notes/components/note_actions_spec.js index 2e0694869ba..259122597fb 100644 --- a/spec/javascripts/notes/components/note_actions_spec.js +++ b/spec/javascripts/notes/components/note_actions_spec.js @@ -16,7 +16,6 @@ describe('noteActions', () => { store, propsData, localVue, - sync: false, }); }; diff --git a/spec/javascripts/notes/components/note_form_spec.js b/spec/javascripts/notes/components/note_form_spec.js index 35283e14dc5..8ab8bce9027 100644 --- a/spec/javascripts/notes/components/note_form_spec.js +++ b/spec/javascripts/notes/components/note_form_spec.js @@ -19,7 +19,6 @@ describe('issue_note_form component', () => { propsData: props, // see https://gitlab.com/gitlab-org/gitlab-foss/issues/56317 for the following localVue, - sync: false, }); }; diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js index 3151fb38a10..6efc6485b9c 100644 --- a/spec/javascripts/notes/components/noteable_discussion_spec.js +++ b/spec/javascripts/notes/components/noteable_discussion_spec.js @@ -36,7 +36,6 @@ describe('noteable_discussion component', () => { store, propsData: { discussion: discussionMock }, localVue, - sync: false, }); }); @@ -196,7 +195,6 @@ describe('noteable_discussion component', () => { store, propsData: { discussion: discussionMock }, localVue, - sync: false, }); }); @@ -216,7 +214,6 @@ describe('noteable_discussion component', () => { store, propsData: { discussion: discussionMock }, localVue, - sync: false, }); }); diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/notes/components/noteable_note_spec.js index 72a13afe498..5fbac7faefd 100644 --- a/spec/javascripts/notes/components/noteable_note_spec.js +++ b/spec/javascripts/notes/components/noteable_note_spec.js @@ -23,7 +23,6 @@ describe('issue_note', () => { propsData: { note, }, - sync: false, localVue, }); }); diff --git a/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js b/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js index cf3ab4d4a68..d8bdf69dfee 100644 --- a/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js +++ b/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js @@ -22,7 +22,6 @@ describe('RelatedMergeRequests', () => { wrapper = mount(localVue.extend(RelatedMergeRequests), { localVue, - sync: false, store: createStore(), propsData: { endpoint: API_ENDPOINT, diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js index bd567f1f93a..f78fcfb52b4 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js @@ -11,7 +11,6 @@ describe('MrWidgetAlertMessage', () => { wrapper = shallowMount(localVue.extend(MrWidgetAlertMessage), { propsData: {}, localVue, - sync: false, }); }); diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js index 2d6d22d66aa..76827cde093 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js @@ -16,7 +16,6 @@ describe('MrWidgetPipelineContainer', () => { ...props, }, localVue, - sync: false, }); }; diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js index cb656525f06..b70d580ed04 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js @@ -9,7 +9,6 @@ describe('Squash before merge component', () => { const createComponent = props => { wrapper = shallowMount(localVue.extend(SquashBeforeMerge), { localVue, - sync: false, propsData: { ...props, }, diff --git a/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js b/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js index 204c0decfd8..9e72a0e2480 100644 --- a/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js +++ b/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js @@ -11,7 +11,6 @@ describe('Graphql Pagination component', () => { hasNextPage, hasPreviousPage, }, - sync: false, localVue, }); } 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 271ae1b645f..e73fb97b741 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 @@ -18,7 +18,6 @@ describe('ProjectListItem component', () => { project, selected: false, }, - sync: false, localVue, }; }); 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 6815da31436..2b60ea0fd74 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 @@ -33,7 +33,6 @@ describe('ProjectSelector component', () => { showLoadingIndicator: false, showSearchErrorMessage: false, }, - sync: false, attachToDocument: true, }); diff --git a/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js b/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js index ad8d5a53291..a8d39b7b5fe 100644 --- a/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js +++ b/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js @@ -15,7 +15,6 @@ describe('TooltipOnTruncate component', () => { const createComponent = ({ propsData, ...options } = {}) => { wrapper = shallowMount(localVue.extend(TooltipOnTruncate), { localVue, - sync: false, attachToDocument: true, propsData: { title: TEST_TITLE, diff --git a/spec/services/auto_merge_service_spec.rb b/spec/services/auto_merge_service_spec.rb index 50dfc49a59c..221cf695331 100644 --- a/spec/services/auto_merge_service_spec.rb +++ b/spec/services/auto_merge_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe AutoMergeService do - set(:project) { create(:project) } - set(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:user) { create(:user) } let(:service) { described_class.new(project, user) } describe '.all_strategies' do diff --git a/spec/services/award_emojis/add_service_spec.rb b/spec/services/award_emojis/add_service_spec.rb index 8364e662735..4bcb5fa039f 100644 --- a/spec/services/award_emojis/add_service_spec.rb +++ b/spec/services/award_emojis/add_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe AwardEmojis::AddService do - set(:user) { create(:user) } - set(:project) { create(:project) } - set(:awardable) { create(:note, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:awardable) { create(:note, project: project) } let(:name) { 'thumbsup' } subject(:service) { described_class.new(awardable, name, user) } diff --git a/spec/services/award_emojis/destroy_service_spec.rb b/spec/services/award_emojis/destroy_service_spec.rb index 6d54c037464..f411345560e 100644 --- a/spec/services/award_emojis/destroy_service_spec.rb +++ b/spec/services/award_emojis/destroy_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe AwardEmojis::DestroyService do - set(:user) { create(:user) } - set(:awardable) { create(:note) } - set(:project) { awardable.project } + let_it_be(:user) { create(:user) } + let_it_be(:awardable) { create(:note) } + let_it_be(:project) { awardable.project } let(:name) { 'thumbsup' } let!(:award_from_other_user) do create(:award_emoji, name: name, awardable: awardable, user: create(:user)) diff --git a/spec/services/award_emojis/toggle_service_spec.rb b/spec/services/award_emojis/toggle_service_spec.rb index a8d110d04f7..069bdfcb99f 100644 --- a/spec/services/award_emojis/toggle_service_spec.rb +++ b/spec/services/award_emojis/toggle_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe AwardEmojis::ToggleService do - set(:user) { create(:user) } - set(:project) { create(:project, :public) } - set(:awardable) { create(:note, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public) } + let_it_be(:awardable) { create(:note, project: project) } let(:name) { 'thumbsup' } subject(:service) { described_class.new(awardable, name, user) } diff --git a/spec/services/boards/issues/move_service_spec.rb b/spec/services/boards/issues/move_service_spec.rb index cf84ec8fd4c..b9ebbc30c1a 100644 --- a/spec/services/boards/issues/move_service_spec.rb +++ b/spec/services/boards/issues/move_service_spec.rb @@ -54,14 +54,14 @@ describe Boards::Issues::MoveService do end describe '#execute_multiple' do - set(:group) { create(:group) } - set(:user) { create(:user) } - set(:project) { create(:project, namespace: group) } - set(:board1) { create(:board, group: group) } - set(:development) { create(:group_label, group: group, name: 'Development') } - set(:testing) { create(:group_label, group: group, name: 'Testing') } - set(:list1) { create(:list, board: board1, label: development, position: 0) } - set(:list2) { create(:list, board: board1, label: testing, position: 1) } + let_it_be(:group) { create(:group) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, namespace: group) } + let_it_be(:board1) { create(:board, group: group) } + let_it_be(:development) { create(:group_label, group: group, name: 'Development') } + let_it_be(:testing) { create(:group_label, group: group, name: 'Testing') } + let_it_be(:list1) { create(:list, board: board1, label: development, position: 0) } + let_it_be(:list2) { create(:list, board: board1, label: testing, position: 1) } let(:params) { { board_id: board1.id, from_list_id: list1.id, to_list_id: list2.id } } before do diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index a4432cbcf5b..c4ce06d9da9 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe Ci::CreatePipelineService do include ProjectForksHelper - set(:project) { create(:project, :repository) } + let_it_be(:project, reload: true) { create(:project, :repository) } let(:user) { create(:admin) } let(:ref_name) { 'refs/heads/master' } diff --git a/spec/services/ci/ensure_stage_service_spec.rb b/spec/services/ci/ensure_stage_service_spec.rb index 43bbd2130a4..de07a1ae238 100644 --- a/spec/services/ci/ensure_stage_service_spec.rb +++ b/spec/services/ci/ensure_stage_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Ci::EnsureStageService, '#execute' do - set(:project) { create(:project) } - set(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:user) { create(:user) } let(:stage) { create(:ci_stage_entity) } let(:job) { build(:ci_build) } diff --git a/spec/services/ci/expire_pipeline_cache_service_spec.rb b/spec/services/ci/expire_pipeline_cache_service_spec.rb index ff2d286465a..c0226654fd9 100644 --- a/spec/services/ci/expire_pipeline_cache_service_spec.rb +++ b/spec/services/ci/expire_pipeline_cache_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Ci::ExpirePipelineCacheService do - set(:user) { create(:user) } - set(:project) { create(:project) } - set(:pipeline) { create(:ci_pipeline, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:pipeline) { create(:ci_pipeline, project: project) } subject { described_class.new } describe '#execute' do diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb index 0339c6cc2d6..0f2d994efd4 100644 --- a/spec/services/ci/register_job_service_spec.rb +++ b/spec/services/ci/register_job_service_spec.rb @@ -4,9 +4,9 @@ require 'spec_helper' module Ci describe RegisterJobService do - set(:group) { create(:group) } - set(:project) { create(:project, group: group, shared_runners_enabled: false, group_runners_enabled: false) } - set(:pipeline) { create(:ci_pipeline, project: project) } + let_it_be(:group) { create(:group) } + let_it_be(:project, reload: true) { create(:project, group: group, shared_runners_enabled: false, group_runners_enabled: false) } + let_it_be(:pipeline) { create(:ci_pipeline, project: project) } let!(:shared_runner) { create(:ci_runner, :instance) } let!(:specific_runner) { create(:ci_runner, :project, projects: [project]) } let!(:group_runner) { create(:ci_runner, :group, groups: [group]) } diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index b0ba795841d..e5933330de5 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Ci::RetryBuildService do - set(:user) { create(:user) } - set(:project) { create(:project, :repository) } - set(:pipeline) do + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :repository) } + let_it_be(:pipeline) do create(:ci_pipeline, project: project, sha: 'b83d6e391c22777fca1ed3012fce84f633d7fed0') end diff --git a/spec/services/error_tracking/list_issues_service_spec.rb b/spec/services/error_tracking/list_issues_service_spec.rb index e0e280591cd..ecb6bcc541b 100644 --- a/spec/services/error_tracking/list_issues_service_spec.rb +++ b/spec/services/error_tracking/list_issues_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe ErrorTracking::ListIssuesService do - set(:user) { create(:user) } - set(:project) { create(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } let(:params) { { search_term: 'something', sort: 'last_seen', cursor: 'some-cursor' } } let(:list_sentry_issues_args) do { diff --git a/spec/services/error_tracking/list_projects_service_spec.rb b/spec/services/error_tracking/list_projects_service_spec.rb index cd4b835e097..ddd369d45f2 100644 --- a/spec/services/error_tracking/list_projects_service_spec.rb +++ b/spec/services/error_tracking/list_projects_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe ErrorTracking::ListProjectsService do - set(:user) { create(:user) } - set(:project) { create(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:project, reload: true) { create(:project) } let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' } let(:token) { 'test-token' } diff --git a/spec/services/external_pull_requests/create_pipeline_service_spec.rb b/spec/services/external_pull_requests/create_pipeline_service_spec.rb index 03481baea87..d1893960960 100644 --- a/spec/services/external_pull_requests/create_pipeline_service_spec.rb +++ b/spec/services/external_pull_requests/create_pipeline_service_spec.rb @@ -4,8 +4,8 @@ require 'spec_helper' describe ExternalPullRequests::CreatePipelineService do describe '#execute' do - set(:project) { create(:project, :auto_devops, :repository) } - set(:user) { create(:user) } + let_it_be(:project) { create(:project, :auto_devops, :repository) } + let_it_be(:user) { create(:user) } let(:pull_request) { create(:external_pull_request, project: project) } before do diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index e7f005cff0b..4d7ec7ac1d8 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -5,8 +5,8 @@ require 'spec_helper' describe Git::BranchPushService, services: true do include RepoHelpers - set(:user) { create(:user) } - set(:project) { create(:project, :repository) } + let_it_be(:user) { create(:user) } + let_it_be(:project, reload: true) { create(:project, :repository) } let(:blankrev) { Gitlab::Git::BLANK_SHA } let(:oldrev) { sample_commit.parent_id } let(:newrev) { sample_commit.id } diff --git a/spec/services/groups/auto_devops_service_spec.rb b/spec/services/groups/auto_devops_service_spec.rb index 7591b2f6f12..63fbdc70c1b 100644 --- a/spec/services/groups/auto_devops_service_spec.rb +++ b/spec/services/groups/auto_devops_service_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe Groups::AutoDevopsService, '#execute' do - set(:group) { create(:group) } - set(:user) { create(:user) } + let_it_be(:group) { create(:group) } + let_it_be(:user) { create(:user) } let(:group_params) { { auto_devops_enabled: '0' } } let(:service) { described_class.new(group, user, group_params) } diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb index 61d1612829f..2c5af11d2e6 100644 --- a/spec/services/issues/referenced_merge_requests_service_spec.rb +++ b/spec/services/issues/referenced_merge_requests_service_spec.rb @@ -15,16 +15,16 @@ describe Issues::ReferencedMergeRequestsService do end end - set(:user) { create(:user) } - set(:project) { create(:project, :public, :repository) } - set(:other_project) { create(:project, :public, :repository) } - set(:issue) { create(:issue, author: user, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public, :repository) } + let_it_be(:other_project) { create(:project, :public, :repository) } + let_it_be(:issue) { create(:issue, author: user, project: project) } - set(:closing_mr) { create_closing_mr(source_project: project) } - set(:closing_mr_other_project) { create_closing_mr(source_project: other_project) } + let_it_be(:closing_mr) { create_closing_mr(source_project: project) } + let_it_be(:closing_mr_other_project) { create_closing_mr(source_project: other_project) } - set(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') } - set(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') } + let_it_be(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') } + let_it_be(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') } let(:service) { described_class.new(project, user) } diff --git a/spec/services/issues/reorder_service_spec.rb b/spec/services/issues/reorder_service_spec.rb index b147cdf4e64..6d72d698b1d 100644 --- a/spec/services/issues/reorder_service_spec.rb +++ b/spec/services/issues/reorder_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Issues::ReorderService do - set(:user) { create(:user) } - set(:project) { create(:project) } - set(:group) { create(:group) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:group) { create(:group) } shared_examples 'issues reorder service' do context 'when reordering issues' do diff --git a/spec/services/issues/zoom_link_service_spec.rb b/spec/services/issues/zoom_link_service_spec.rb index f34d2a18552..3fb1eae361a 100644 --- a/spec/services/issues/zoom_link_service_spec.rb +++ b/spec/services/issues/zoom_link_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Issues::ZoomLinkService do - set(:user) { create(:user) } - set(:issue) { create(:issue) } + let_it_be(:user) { create(:user) } + let_it_be(:issue) { create(:issue) } let(:project) { issue.project } let(:service) { described_class.new(issue, user) } diff --git a/spec/services/merge_requests/create_pipeline_service_spec.rb b/spec/services/merge_requests/create_pipeline_service_spec.rb index 25f5c54a413..9eb28759061 100644 --- a/spec/services/merge_requests/create_pipeline_service_spec.rb +++ b/spec/services/merge_requests/create_pipeline_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe MergeRequests::CreatePipelineService do - set(:project) { create(:project, :repository) } - set(:user) { create(:user) } + let_it_be(:project) { create(:project, :repository) } + let_it_be(:user) { create(:user) } let(:service) { described_class.new(project, user, params) } let(:params) { {} } diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 61c8103353c..fa1a8f60256 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe MergeRequests::MergeService do - set(:user) { create(:user) } - set(:user2) { create(:user) } + let_it_be(:user) { create(:user) } + let_it_be(:user2) { create(:user) } let(:merge_request) { create(:merge_request, :simple, author: user2, assignees: [user2]) } let(:project) { merge_request.project } diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb index 77e38f1eb4c..5c26e32bb22 100644 --- a/spec/services/merge_requests/merge_to_ref_service_spec.rb +++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb @@ -67,7 +67,7 @@ describe MergeRequests::MergeToRefService do end end - set(:user) { create(:user) } + let_it_be(:user) { create(:user) } let(:merge_request) { create(:merge_request, :simple) } let(:project) { merge_request.project } @@ -214,7 +214,7 @@ describe MergeRequests::MergeToRefService do end describe 'cascading merge refs' do - set(:project) { create(:project, :repository) } + let_it_be(:project) { create(:project, :repository) } let(:params) { { commit_message: 'Cascading merge', first_parent_ref: first_parent_ref, target_ref: target_ref, sha: merge_request.diff_head_sha } } context 'when first merge happens' do diff --git a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb index 53b7497ae21..744693dad15 100644 --- a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb @@ -5,9 +5,9 @@ require 'spec_helper' describe Metrics::Dashboard::CustomMetricEmbedService do include MetricsDashboardHelpers - set(:project) { build(:project) } - set(:user) { create(:user) } - set(:environment) { create(:environment, project: project) } + let_it_be(:project, reload: true) { build(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:environment) { create(:environment, project: project) } before do project.add_maintainer(user) diff --git a/spec/services/metrics/dashboard/default_embed_service_spec.rb b/spec/services/metrics/dashboard/default_embed_service_spec.rb index 803b9a93be7..741a9644905 100644 --- a/spec/services/metrics/dashboard/default_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/default_embed_service_spec.rb @@ -5,9 +5,9 @@ require 'spec_helper' describe Metrics::Dashboard::DefaultEmbedService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers - set(:project) { build(:project) } - set(:user) { create(:user) } - set(:environment) { create(:environment, project: project) } + let_it_be(:project) { build(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:environment) { create(:environment, project: project) } before do project.add_maintainer(user) diff --git a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb index a0f7315f750..c1ce9818f21 100644 --- a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb @@ -5,9 +5,9 @@ require 'spec_helper' describe Metrics::Dashboard::DynamicEmbedService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers - set(:project) { build(:project) } - set(:user) { create(:user) } - set(:environment) { create(:environment, project: project) } + let_it_be(:project) { build(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:environment) { create(:environment, project: project) } before do project.add_maintainer(user) diff --git a/spec/services/metrics/dashboard/project_dashboard_service_spec.rb b/spec/services/metrics/dashboard/project_dashboard_service_spec.rb index ab7a7b97861..cba8ef2ec98 100644 --- a/spec/services/metrics/dashboard/project_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/project_dashboard_service_spec.rb @@ -5,9 +5,9 @@ require 'spec_helper' describe Metrics::Dashboard::ProjectDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers - set(:user) { create(:user) } - set(:project) { create(:project) } - set(:environment) { create(:environment, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:environment) { create(:environment, project: project) } before do project.add_maintainer(user) diff --git a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb index 95c5a1479a4..cc9f711c611 100644 --- a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb @@ -5,9 +5,9 @@ require 'spec_helper' describe Metrics::Dashboard::SystemDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers - set(:user) { create(:user) } - set(:project) { create(:project) } - set(:environment) { create(:environment, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:environment) { create(:environment, project: project) } before do project.add_maintainer(user) diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb index 8fd03428eb2..c5e2fe8de12 100644 --- a/spec/services/notes/create_service_spec.rb +++ b/spec/services/notes/create_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Notes::CreateService do - set(:project) { create(:project, :repository) } - set(:issue) { create(:issue, project: project) } - set(:user) { create(:user) } + let_it_be(:project) { create(:project, :repository) } + let_it_be(:issue) { create(:issue, project: project) } + let_it_be(:user) { create(:user) } let(:opts) do { note: 'Awesome comment', noteable_type: 'Issue', noteable_id: issue.id } end @@ -216,12 +216,12 @@ describe Notes::CreateService do context 'note with commands' do context 'all quick actions' do - set(:milestone) { create(:milestone, project: project, title: "sprint") } - set(:bug_label) { create(:label, project: project, title: 'bug') } - set(:to_be_copied_label) { create(:label, project: project, title: 'to be copied') } - set(:feature_label) { create(:label, project: project, title: 'feature') } - set(:issue) { create(:issue, project: project, labels: [bug_label], due_date: '2019-01-01') } - set(:issue_2) { create(:issue, project: project, labels: [bug_label, to_be_copied_label]) } + let_it_be(:milestone) { create(:milestone, project: project, title: "sprint") } + let_it_be(:bug_label) { create(:label, project: project, title: 'bug') } + let_it_be(:to_be_copied_label) { create(:label, project: project, title: 'to be copied') } + let_it_be(:feature_label) { create(:label, project: project, title: 'feature') } + let_it_be(:issue, reload: true) { create(:issue, project: project, labels: [bug_label], due_date: '2019-01-01') } + let_it_be(:issue_2) { create(:issue, project: project, labels: [bug_label, to_be_copied_label]) } context 'for issues' do let(:issuable) { issue } @@ -272,7 +272,7 @@ describe Notes::CreateService do end context 'for merge requests' do - set(:merge_request) { create(:merge_request, source_project: project, labels: [bug_label]) } + let_it_be(:merge_request) { create(:merge_request, source_project: project, labels: [bug_label]) } let(:issuable) { merge_request } let(:note_params) { opts.merge(noteable_type: 'MergeRequest', noteable_id: merge_request.id) } let(:merge_request_quick_actions) do diff --git a/spec/services/notes/destroy_service_spec.rb b/spec/services/notes/destroy_service_spec.rb index 9faf1299ef2..258e5c68265 100644 --- a/spec/services/notes/destroy_service_spec.rb +++ b/spec/services/notes/destroy_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Notes::DestroyService do - set(:project) { create(:project, :public) } - set(:issue) { create(:issue, project: project) } + let_it_be(:project) { create(:project, :public) } + let_it_be(:issue) { create(:issue, project: project) } let(:user) { issue.author } describe '#execute' do diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index 5440a42348e..80b8d36aa07 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -155,7 +155,7 @@ describe NotificationService, :mailer do describe '#async' do let(:async) { notification.async } - set(:key) { create(:personal_key) } + let_it_be(:key) { create(:personal_key) } it 'returns an Async object with the correct parent' do expect(async).to be_a(described_class::Async) @@ -2508,14 +2508,14 @@ describe NotificationService, :mailer do end describe 'Pages domains' do - set(:project) { create(:project) } - set(:domain) { create(:pages_domain, project: project) } - set(:u_blocked) { create(:user, :blocked) } - set(:u_silence) { create_user_with_notification(:disabled, 'silent', project) } - set(:u_owner) { project.owner } - set(:u_maintainer1) { create(:user) } - set(:u_maintainer2) { create(:user) } - set(:u_developer) { create(:user) } + let_it_be(:project, reload: true) { create(:project) } + let_it_be(:domain, reload: true) { create(:pages_domain, project: project) } + let_it_be(:u_blocked) { create(:user, :blocked) } + let_it_be(:u_silence) { create_user_with_notification(:disabled, 'silent', project) } + let_it_be(:u_owner) { project.owner } + let_it_be(:u_maintainer1) { create(:user) } + let_it_be(:u_maintainer2) { create(:user) } + let_it_be(:u_developer) { create(:user) } before do project.add_maintainer(u_blocked) diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb index 14772d172e8..78b969c8a0e 100644 --- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb +++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Projects::ContainerRepository::CleanupTagsService do - set(:user) { create(:user) } - set(:project) { create(:project, :private) } - set(:repository) { create(:container_repository, :root, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :private) } + let_it_be(:repository) { create(:container_repository, :root, project: project) } let(:service) { described_class.new(project, user, params) } diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb index 7ceb02c9cf8..decbbb7597f 100644 --- a/spec/services/projects/container_repository/delete_tags_service_spec.rb +++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Projects::ContainerRepository::DeleteTagsService do - set(:user) { create(:user) } - set(:project) { create(:project, :private) } - set(:repository) { create(:container_repository, :root, project: project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :private) } + let_it_be(:repository) { create(:container_repository, :root, project: project) } let(:params) { { tags: tags } } let(:service) { described_class.new(project, user, params) } diff --git a/spec/services/projects/container_repository/destroy_service_spec.rb b/spec/services/projects/container_repository/destroy_service_spec.rb index affcc66d2bb..cc8fd2716e1 100644 --- a/spec/services/projects/container_repository/destroy_service_spec.rb +++ b/spec/services/projects/container_repository/destroy_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Projects::ContainerRepository::DestroyService do - set(:user) { create(:user) } - set(:project) { create(:project, :private) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :private) } subject { described_class.new(project, user) } diff --git a/spec/services/projects/detect_repository_languages_service_spec.rb b/spec/services/projects/detect_repository_languages_service_spec.rb index df5eed18ac0..76600b0e77c 100644 --- a/spec/services/projects/detect_repository_languages_service_spec.rb +++ b/spec/services/projects/detect_repository_languages_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state do - set(:project) { create(:project, :repository) } + let_it_be(:project, reload: true) { create(:project, :repository) } subject { described_class.new(project) } @@ -51,7 +51,7 @@ describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_ end context 'when no repository exists' do - set(:project) { create(:project) } + let_it_be(:project) { create(:project) } it 'has no languages' do expect(subject.execute).to be_empty diff --git a/spec/services/projects/gitlab_projects_import_service_spec.rb b/spec/services/projects/gitlab_projects_import_service_spec.rb index 78580bfa604..1662d4577aa 100644 --- a/spec/services/projects/gitlab_projects_import_service_spec.rb +++ b/spec/services/projects/gitlab_projects_import_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Projects::GitlabProjectsImportService do - set(:namespace) { create(:namespace) } + let_it_be(:namespace) { create(:namespace) } let(:path) { 'test-path' } let(:file) { fixture_file_upload('spec/fixtures/project_export.tar.gz') } let(:overwrite) { false } diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb index c99054d9fd5..60804a8dba6 100644 --- a/spec/services/projects/housekeeping_service_spec.rb +++ b/spec/services/projects/housekeeping_service_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe Projects::HousekeepingService do subject { described_class.new(project) } - set(:project) { create(:project, :repository) } + let_it_be(:project) { create(:project, :repository) } before do project.reset_pushes_since_gc diff --git a/spec/services/projects/open_merge_requests_count_service_spec.rb b/spec/services/projects/open_merge_requests_count_service_spec.rb index f9fff4cbd4c..7d848f9f2c3 100644 --- a/spec/services/projects/open_merge_requests_count_service_spec.rb +++ b/spec/services/projects/open_merge_requests_count_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Projects::OpenMergeRequestsCountService, :use_clean_rails_memory_store_caching do - set(:project) { create(:project) } + let_it_be(:project) { create(:project) } subject { described_class.new(project) } diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb index 81d59a98b9b..93cd5c43e86 100644 --- a/spec/services/projects/operations/update_service_spec.rb +++ b/spec/services/projects/operations/update_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Projects::Operations::UpdateService do - set(:user) { create(:user) } - set(:project) { create(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:project, reload: true) { create(:project) } let(:result) { subject.execute } diff --git a/spec/services/projects/participants_service_spec.rb b/spec/services/projects/participants_service_spec.rb index 239d28557ee..6eaf7a71b23 100644 --- a/spec/services/projects/participants_service_spec.rb +++ b/spec/services/projects/participants_service_spec.rb @@ -4,8 +4,8 @@ require 'spec_helper' describe Projects::ParticipantsService do describe '#groups' do - set(:user) { create(:user) } - set(:project) { create(:project, :public) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public) } let(:service) { described_class.new(project, user) } it 'avoids N+1 queries' do @@ -62,10 +62,10 @@ describe Projects::ParticipantsService do subject(:usernames) { service.project_members.map { |member| member[:username] } } context 'when there is a project in group namespace' do - set(:public_group) { create(:group, :public) } - set(:public_project) { create(:project, :public, namespace: public_group)} + let_it_be(:public_group) { create(:group, :public) } + let_it_be(:public_project) { create(:project, :public, namespace: public_group)} - set(:public_group_owner) { create(:user) } + let_it_be(:public_group_owner) { create(:user) } let(:service) { described_class.new(public_project, create(:user)) } @@ -79,18 +79,18 @@ describe Projects::ParticipantsService do end context 'when there is a private group and a public project' do - set(:public_group) { create(:group, :public) } - set(:private_group) { create(:group, :private, :nested) } - set(:public_project) { create(:project, :public, namespace: public_group)} + let_it_be(:public_group) { create(:group, :public) } + let_it_be(:private_group) { create(:group, :private, :nested) } + let_it_be(:public_project) { create(:project, :public, namespace: public_group)} - set(:project_issue) { create(:issue, project: public_project)} + let_it_be(:project_issue) { create(:issue, project: public_project)} - set(:public_group_owner) { create(:user) } - set(:private_group_member) { create(:user) } - set(:public_project_maintainer) { create(:user) } - set(:private_group_owner) { create(:user) } + let_it_be(:public_group_owner) { create(:user) } + let_it_be(:private_group_member) { create(:user) } + let_it_be(:public_project_maintainer) { create(:user) } + let_it_be(:private_group_owner) { create(:user) } - set(:group_ancestor_owner) { create(:user) } + let_it_be(:group_ancestor_owner) { create(:user) } before(:context) do public_group.add_owner public_group_owner diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb index 9aa8c7f85ca..001c6670f4b 100644 --- a/spec/services/projects/update_pages_service_spec.rb +++ b/spec/services/projects/update_pages_service_spec.rb @@ -3,9 +3,9 @@ require "spec_helper" describe Projects::UpdatePagesService do - set(:project) { create(:project, :repository) } - set(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) } - set(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') } + let_it_be(:project, refind: true) { create(:project, :repository) } + let_it_be(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) } + let_it_be(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') } let(:invalid_file) { fixture_file_upload('spec/fixtures/dk.png') } let(:file) { fixture_file_upload("spec/fixtures/pages.zip") } diff --git a/spec/services/prometheus/proxy_service_spec.rb b/spec/services/prometheus/proxy_service_spec.rb index 0ce08252425..5a036194d01 100644 --- a/spec/services/prometheus/proxy_service_spec.rb +++ b/spec/services/prometheus/proxy_service_spec.rb @@ -5,8 +5,8 @@ require 'spec_helper' describe Prometheus::ProxyService do include ReactiveCachingHelpers - set(:project) { create(:project) } - set(:environment) { create(:environment, project: project) } + let_it_be(:project) { create(:project) } + let_it_be(:environment) { create(:environment, project: project) } describe 'configuration' do it 'ReactiveCaching refresh is not needed' do diff --git a/spec/services/resource_events/change_labels_service_spec.rb b/spec/services/resource_events/change_labels_service_spec.rb index 070964eb1ec..2b987b7fec9 100644 --- a/spec/services/resource_events/change_labels_service_spec.rb +++ b/spec/services/resource_events/change_labels_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe ResourceEvents::ChangeLabelsService do - set(:project) { create(:project) } - set(:author) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:author) { create(:user) } let(:resource) { create(:issue, project: project) } describe '.change_labels' do diff --git a/spec/services/resource_events/merge_into_notes_service_spec.rb b/spec/services/resource_events/merge_into_notes_service_spec.rb index 72467091791..6bad1b86fca 100644 --- a/spec/services/resource_events/merge_into_notes_service_spec.rb +++ b/spec/services/resource_events/merge_into_notes_service_spec.rb @@ -16,11 +16,11 @@ describe ResourceEvents::MergeIntoNotesService do create(:note_on_issue, opts.merge(params)) end - set(:project) { create(:project) } - set(:user) { create(:user) } - set(:resource) { create(:issue, project: project) } - set(:label) { create(:label, project: project) } - set(:label2) { create(:label, project: project) } + let_it_be(:project) { create(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:resource) { create(:issue, project: project) } + let_it_be(:label) { create(:label, project: project) } + let_it_be(:label2) { create(:label, project: project) } let(:time) { Time.now } describe '#execute' do diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index a952e26e338..fa7b1003b8d 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -7,9 +7,9 @@ describe SystemNoteService do include RepoHelpers include AssetsHelpers - set(:group) { create(:group) } - set(:project) { create(:project, :repository, group: group) } - set(:author) { create(:user) } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, :repository, group: group) } + let_it_be(:author) { create(:user) } let(:noteable) { create(:issue, project: project) } let(:issue) { noteable } diff --git a/spec/services/system_notes/commit_service_spec.rb b/spec/services/system_notes/commit_service_spec.rb index 4d4403be59a..5839a17e4a0 100644 --- a/spec/services/system_notes/commit_service_spec.rb +++ b/spec/services/system_notes/commit_service_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe SystemNotes::CommitService do - set(:group) { create(:group) } - set(:project) { create(:project, :repository, group: group) } - set(:author) { create(:user) } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, :repository, group: group) } + let_it_be(:author) { create(:user) } let(:commit_service) { described_class.new(noteable: noteable, project: project, author: author) } |