Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes

2 files changed, 35 insertions, 29 deletions

diff --git a/spec/javascripts/ide/components/commit_sidebar/empty_state_spec.js b/spec/javascripts/ide/components/commit_sidebar/empty_state_spec.js
index 5df2d46ca6b..16d0b354a30 100644
--- a/spec/javascripts/ide/components/commit_sidebar/empty_state_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/empty_state_spec.js
@@ -11,7 +11,6 @@ describe('IDE commit panel empty state', () => {
     const Component = Vue.extend(emptyState);
 
     Vue.set(store.state, 'noChangesStateSvgPath', 'no-changes');
-    Vue.set(store.state, 'committedStateSvgPath', 'committed-state');
 
     vm = createComponentWithStore(Component, store);
 
@@ -24,35 +23,7 @@ describe('IDE commit panel empty state', () => {
     resetStore(vm.$store);
   });
 
-  describe('statusSvg', () => {
-    it('uses noChangesStateSvgPath when commit message is empty', () => {
-      expect(vm.statusSvg).toBe('no-changes');
-      expect(vm.$el.querySelector('img').getAttribute('src')).toBe('no-changes');
-    });
-
-    it('uses committedStateSvgPath when commit message exists', done => {
-      vm.$store.state.lastCommitMsg = 'testing';
-
-      Vue.nextTick(() => {
-        expect(vm.statusSvg).toBe('committed-state');
-        expect(vm.$el.querySelector('img').getAttribute('src')).toBe('committed-state');
-
-        done();
-      });
-    });
-  });
-
   it('renders no changes text when last commit message is empty', () => {
     expect(vm.$el.textContent).toContain('No changes');
   });
-
-  it('renders last commit message when it exists', done => {
-    vm.$store.state.lastCommitMsg = 'testing commit message';
-
-    Vue.nextTick(() => {
-      expect(vm.$el.textContent).toContain('testing commit message');
-
-      done();
-    });
-  });
 });
diff --git a/spec/javascripts/ide/components/commit_sidebar/success_message_spec.js b/spec/javascripts/ide/components/commit_sidebar/success_message_spec.js
new file mode 100644
index 00000000000..e1a432b81be
--- /dev/null
+++ b/spec/javascripts/ide/components/commit_sidebar/success_message_spec.js
@@ -0,0 +1,35 @@
+import Vue from 'vue';
+import store from '~/ide/stores';
+import successMessage from '~/ide/components/commit_sidebar/success_message.vue';
+import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
+import { resetStore } from '../../helpers';
+
+describe('IDE commit panel successful commit state', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(successMessage);
+
+    vm = createComponentWithStore(Component, store, {
+      committedStateSvgPath: 'committed-state',
+    });
+
+    vm.$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+
+    resetStore(vm.$store);
+  });
+
+  it('renders last commit message when it exists', done => {
+    vm.$store.state.lastCommitMsg = 'testing commit message';
+
+    Vue.nextTick(() => {
+      expect(vm.$el.textContent).toContain('testing commit message');
+
+      done();
+    });
+  });
+});