Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-10 14:12:40 +0300
committerPhil Hughes <me@iamphill.com>2018-05-10 14:12:40 +0300
commitc6696389593c3bd4484574110d3aa0f0facdb2e9 (patch)
tree769faab3fdba9c9cb8c9102a4d6d17fbd417066a
parent5c8f31eb7ee9a4993b41a72d34afddd43831517e (diff)
fixed specs
-rw-r--r--spec/javascripts/ide/components/commit_sidebar/actions_spec.js8
-rw-r--r--spec/javascripts/ide/components/commit_sidebar/form_spec.js3
2 files changed, 4 insertions, 7 deletions
diff --git a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
index 1bdc254d8d0..27f10caccb1 100644
--- a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
@@ -15,9 +15,7 @@ describe('IDE commit sidebar actions', () => {
vm.$store.state.currentBranchId = 'master';
vm.$store.state.currentProjectId = 'abcproject';
- vm.$store.state.projects.abcproject = {
- ...projectData,
- };
+ Vue.set(vm.$store.state.projects, 'abcproject', { ...projectData });
vm.$mount();
@@ -39,12 +37,8 @@ describe('IDE commit sidebar actions', () => {
});
it('hides merge request option when project merge requests are disabled', done => {
- vm.$destroy();
-
vm.$store.state.projects.abcproject.merge_requests_enabled = false;
- vm.$mount();
-
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('input[type="radio"]').length).toBe(2);
expect(vm.$el.textContent).not.toContain('Create a new branch and merge request');
diff --git a/spec/javascripts/ide/components/commit_sidebar/form_spec.js b/spec/javascripts/ide/components/commit_sidebar/form_spec.js
index ce7c134bc97..8b47a365582 100644
--- a/spec/javascripts/ide/components/commit_sidebar/form_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/form_spec.js
@@ -4,6 +4,7 @@ import CommitForm from '~/ide/components/commit_sidebar/form.vue';
import { activityBarViews } from '~/ide/constants';
import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
+import { projectData } from 'spec/ide/mock_data';
import { resetStore } from '../../helpers';
describe('IDE commit form', () => {
@@ -14,6 +15,8 @@ describe('IDE commit form', () => {
spyOnProperty(window, 'innerHeight').and.returnValue(800);
store.state.changedFiles.push('test');
+ store.state.currentProjectId = 'abcproject';
+ Vue.set(store.state.projects, 'abcproject', { ...projectData });
vm = createComponentWithStore(Component, store).$mount();
});