Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/diffs/components/diff_expansion_cell.vue

@@ -213,7 +213,7 @@ export default {
 
 <template>
   <td :colspan="colspan">
-    <div class="content">
+    <div class="content js-line-expansion-content">
       <a
         v-if="canExpandUp"
         v-tooltip

spec/javascripts/diffs/components/diff_file_spec.js

@@ -15,8 +15,12 @@ describe('DiffFile', () => {
     }).$mount();
   });
 
+  afterEach(() => {
+    vm.$destroy();
+  });
+
   describe('template', () => {
-    it('should render component with file header, file content components', () => {
+    it('should render component with file header, file content components', done => {
       const el = vm.$el;
       const { file_hash, file_path } = vm.file;
 
@@ -30,9 +34,13 @@ describe('DiffFile', () => {
 
       vm.file.renderIt = true;
 
-      vm.$nextTick(() => {
-        expect(el.querySelectorAll('.line_content').length).toBeGreaterThan(5);
-      });
+      vm.$nextTick()
+        .then(() => {
+          expect(el.querySelectorAll('.line_content').length).toBeGreaterThanOrEqual(5);
+          expect(el.querySelectorAll('.js-line-expansion-content').length).toBe(1);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     describe('collapsed', () => {