Merge branch 'winh-fix-pdf-page-spec-timing' into 'master'

Remove waiting from PDF page component test

See merge request gitlab-org/gitlab-ce!21365

spec/javascripts/pdf/page_spec.js

@@ -3,53 +3,45 @@ import pdfjsLib from 'vendor/pdf';
 import workerSrc from 'vendor/pdf.worker.min';
 
 import PageComponent from '~/pdf/page/index.vue';
-import testPDF from '../fixtures/blob/pdf/test.pdf';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
-
+import testPDF from 'spec/fixtures/blob/pdf/test.pdf';
-const Component = Vue.extend(PageComponent);
 
 describe('Page component', () => {
+  const Component = Vue.extend(PageComponent);
   let vm;
   let testPage;
+
+  beforeEach(done => {
     pdfjsLib.PDFJS.workerSrc = workerSrc;
-
+    pdfjsLib
-  const checkRendered = (done) => {
+      .getDocument(testPDF)
-    if (vm.rendering) {
-      setTimeout(() => {
-        checkRendered(done);
-      }, 100);
-    } else {
-      done();
-    }
-  };
-
-  beforeEach((done) => {
-    pdfjsLib.getDocument(testPDF)
       .then(pdf => pdf.getPage(1))
-      .then((page) => {
+      .then(page => {
         testPage = page;
-        done();
       })
-      .catch((error) => {
+      .then(done)
-        done.fail(error);
+      .catch(done.fail);
-      });
   });
 
-  describe('render', () => {
+  afterEach(() => {
-    beforeEach((done) => {
+    vm.$destroy();
-      vm = new Component({
+  });
-        propsData: {
+
+  it('renders the page when mounting', done => {
+    const promise = Promise.resolve();
+    spyOn(testPage, 'render').and.callFake(() => promise);
+    vm = mountComponent(Component, {
       page: testPage,
       number: 1,
-        },
     });
+    expect(vm.rendering).toBe(true);
 
-      vm.$mount();
+    promise
-
+      .then(() => {
-      checkRendered(done);
+        expect(testPage.render).toHaveBeenCalledWith(vm.renderContext);
-    });
+        expect(vm.rendering).toBe(false);
-
+      })
-    it('renders first page', () => {
+      .then(done)
-      expect(vm.$el.tagName).toBeDefined();
+      .catch(done.fail);
-    });
   });
 });