From 5e67b2fdb0d4d308b82a22290c1ac46d41d09469 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 6 Apr 2017 10:08:33 +0100
Subject: [PATCH] Wait for the PDF to be loaded before doing anything

Closes #30531
---
 app/assets/javascripts/blob/pdf/index.js |  2 +-
 spec/javascripts/blob/pdf/index_spec.js  | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js
index 5b79717d1e1..a74c2db9a61 100644
--- a/app/assets/javascripts/blob/pdf/index.js
+++ b/app/assets/javascripts/blob/pdf/index.js
@@ -10,7 +10,7 @@ Vue.use(PDFLab, {
 export default () => {
   const el = document.getElementById('js-pdf-viewer');
 
-  new Vue({
+  return new Vue({
     el,
     data() {
       return {
diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js
index 19a4e55a9db..d3a4d04345b 100644
--- a/spec/javascripts/blob/pdf/index_spec.js
+++ b/spec/javascripts/blob/pdf/index_spec.js
@@ -3,6 +3,18 @@ import testPDF from './test.pdf';
 
 describe('PDF renderer', () => {
   let viewer;
+  let app;
+
+  const checkLoaded = (done) => {
+    if (app.loading) {
+      setTimeout(() => {
+        checkLoaded(done);
+      }, 100);
+    } else {
+      done();
+    }
+  };
+
   preloadFixtures('static/pdf_viewer.html.raw');
 
   beforeEach(() => {
@@ -21,11 +33,9 @@ describe('PDF renderer', () => {
 
   describe('successful response', () => {
     beforeEach((done) => {
-      renderPDF();
+      app = renderPDF();
 
-      setTimeout(() => {
-        done();
-      }, 500);
+      checkLoaded(done);
     });
 
     it('does not show loading icon', () => {
@@ -50,11 +60,9 @@ describe('PDF renderer', () => {
   describe('error getting file', () => {
     beforeEach((done) => {
       viewer.dataset.endpoint = 'invalid/endpoint';
-      renderPDF();
+      app = renderPDF();
 
-      setTimeout(() => {
-        done();
-      }, 500);
+      checkLoaded(done);
     });
 
     it('does not show loading icon', () => {