Refactor commit_block specs

spec/frontend/jobs/components/commit_block_spec.js

@@ -6,77 +6,65 @@ import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 describe('Commit block', () => {
   let wrapper;
 
-  const defaults = {
-    commit: {
-      short_id: '1f0fb84f',
-      id: '1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
-      commit_path: 'commit/1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
-      title: 'Update README.md',
-    },
-    mergeRequest: {
-      iid: '!21244',
-      path: 'merge_requests/21244',
-    },
-    isLastBlock: true,
+  const commit = {
+    short_id: '1f0fb84f',
+    id: '1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
+    commit_path: 'commit/1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
+    title: 'Update README.md',
+  };
+
+  const mergeRequest = {
+    iid: '!21244',
+    path: 'merge_requests/21244',
   };
 
   const findCommitSha = () => wrapper.findByTestId('commit-sha');
   const findLinkSha = () => wrapper.findByTestId('link-commit');
 
-  function mountComponent(props = {}) {
+  const mountComponent = (props) => {
     wrapper = extendedWrapper(
       shallowMount(CommitBlock, {
         propsData: {
+          commit,
           ...props,
         },
       }),
     );
-  }
+  };
 
   afterEach(() => {
     wrapper.destroy();
   });
 
-  describe('pipeline short sha', () => {
+  describe('without merge request', () => {
     beforeEach(() => {
-      mountComponent(defaults);
+      mountComponent();
     });
 
     it('renders pipeline short sha link', () => {
-      expect(findCommitSha().attributes('href')).toBe(defaults.commit.commit_path);
-      expect(findCommitSha().text()).toBe(defaults.commit.short_id);
+      expect(findCommitSha().attributes('href')).toBe(commit.commit_path);
+      expect(findCommitSha().text()).toBe(commit.short_id);
     });
 
     it('renders clipboard button', () => {
-      expect(wrapper.findComponent(ClipboardButton).attributes('text')).toBe(defaults.commit.id);
+      expect(wrapper.findComponent(ClipboardButton).attributes('text')).toBe(commit.id);
     });
-  });
-
-  describe('with merge request', () => {
-    it('renders merge request link and reference', () => {
-      mountComponent(defaults);
 
-      expect(findLinkSha().attributes('href')).toBe(defaults.mergeRequest.path);
-      expect(findLinkSha().text()).toBe(`!${defaults.mergeRequest.iid}`);
+    it('renders git commit title', () => {
+      expect(wrapper.text()).toContain(commit.title);
     });
-  });
 
-  describe('without merge request', () => {
     it('does not render merge request', () => {
-      const copyProps = { ...defaults };
-      delete copyProps.mergeRequest;
-
-      mountComponent(copyProps);
-
       expect(findLinkSha().exists()).toBe(false);
     });
   });
 
-  describe('git commit title', () => {
-    it('renders git commit title', () => {
-      mountComponent(defaults);
+  describe('with merge request', () => {
+    it('renders merge request link and reference', () => {
+      mountComponent({ mergeRequest });
 
-      expect(wrapper.text()).toContain(defaults.commit.title);
+      expect(findLinkSha().attributes('href')).toBe(mergeRequest.path);
+      expect(findLinkSha().text()).toBe(`!${mergeRequest.iid}`);
     });
   });
 });