From de5b36a574093a9980822e0ad97f7a842ff5d473 Mon Sep 17 00:00:00 2001
From: Jonas Galvez <jonasgalvez@gmail.com>
Date: Mon, 6 Aug 2018 15:42:26 -0300
Subject: [PATCH] `loading: false` e2e test fix (#3635)

*  hotfix

* Fixed manual loading test

* Disable waitFor() test due to random failure in appveyor
---
 test/e2e/basic.browser.test.js          | 10 ++++++----
 test/fixtures/basic/pages/noloading.vue | 10 +++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js
index 9da3b87af5..cad9abdf2b 100644
--- a/test/e2e/basic.browser.test.js
+++ b/test/e2e/basic.browser.test.js
@@ -33,10 +33,12 @@ describe('basic browser', () => {
     expect(loading.show).toBe(true)
     await hook
     expect(loading.show).toBe(true)
-    await page.waitForFunction(`document.querySelector('p').innerText === 'true'`)
-    expect(await page.$text('p')).toBe('true')
-    loading = await page.nuxt.loadingData()
-    expect(loading.show).toBe(true)
+    await page.waitForFunction(
+      `$nuxt.$loading.$data.show === false`
+    )
+    await page.waitForFunction(
+      `document.querySelector('p').innerText === 'true'`
+    )
   })
 
   test('/stateless', async () => {
diff --git a/test/fixtures/basic/pages/noloading.vue b/test/fixtures/basic/pages/noloading.vue
index d79eab5c11..ab6809f180 100644
--- a/test/fixtures/basic/pages/noloading.vue
+++ b/test/fixtures/basic/pages/noloading.vue
@@ -17,14 +17,10 @@ export default {
     })
   },
   mounted() {
+    this.$nuxt.$loading.finish()
     setTimeout(() => {
-      this.$nuxt.$loading.finish()
-      setTimeout(() => {
-        // Re-enable loader as we move on
-        // to normal pages in the test
-        this.$nuxt.$loading.start()
-        this.loaded = true
-      }, 1500)
+      this.$nuxt.$loading.start()
+      this.loaded = true
     }, 1500)
   }
 }