test: replace waitForFunction with waitForXPath

tiwuofficial · Sep 6, 2019 · b2848ae · b2848ae
1 parent 71aeaea
commit b2848ae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -82,7 +82,6 @@
     "yorkie": "^2.0.0"
   },
   "resolutions": {
-    "puppeteer": "1.11.0",
     "vue": "^2.6.10",
     "vue-template-compiler": "^2.6.10",
     "vue-server-renderer": "^2.6.10"

diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js
@@ -19,10 +19,7 @@ exports.assertServe = async (name, options) => {
         const file = await project.read(`src/App.vue`)
         project.write(`src/App.vue`, file.replace(msg, `Updated`))
         await nextUpdate() // wait for child stdout update signal
-        await page.waitForFunction(selector => {
-          const el = document.querySelector(selector)
-          return el && el.textContent.includes('Updated')
-        }, {}, 'h1')
+        await page.waitForXPath('//h1[contains(text(), "Updated")]')
       }
     )
   })

diff --git a/packages/@vue/cli-service-global/__tests__/globalService.spec.js b/packages/@vue/cli-service-global/__tests__/globalService.spec.js
@@ -35,10 +35,7 @@ test('global serve', async () => {
       expect(await helpers.getText('h1')).toMatch('hi')
       write('App.vue', entryVue.replace(`{{ msg }}`, 'Updated'))
       await nextUpdate() // wait for child stdout update signal
-      await page.waitForFunction(selector => {
-        const el = document.querySelector(selector)
-        return el && el.textContent.includes('Updated')
-      }, {}, 'h1')
+      await page.waitForXPath('//h1[contains(text(), "Updated")]')
     }
   )
 })

diff --git a/packages/@vue/cli-service/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js
@@ -19,10 +19,7 @@ test('serve', async () => {
       const file = await project.read(`src/App.vue`)
       project.write(`src/App.vue`, file.replace(msg, `Updated`))
       await nextUpdate() // wait for child stdout update signal
-      await page.waitForFunction(selector => {
-        const el = document.querySelector(selector)
-        return el && el.textContent.includes('Updated')
-      }, {}, 'h1')
+      await page.waitForXPath('//h1[contains(text(), "Updated")]')
     }
   )
 })
@@ -105,10 +102,7 @@ test('serve with inline entry', async () => {
       const file = await project.read(`src/App.vue`)
       project.write(`src/App.vue`, file.replace(msg, `Updated`))
       await nextUpdate() // wait for child stdout update signal
-      await page.waitForFunction(selector => {
-        const el = document.querySelector(selector)
-        return el && el.textContent.includes('Updated')
-      }, {}, 'h1')
+      await page.waitForXPath('//h1[contains(text(), "Updated")]')
     }
   )
 })
@@ -128,10 +122,7 @@ test('serve with no public dir', async () => {
       const file = await project.read(`src/App.vue`)
       project.write(`src/App.vue`, file.replace(msg, `Updated`))
       await nextUpdate() // wait for child stdout update signal
-      await page.waitForFunction(selector => {
-        const el = document.querySelector(selector)
-        return el && el.textContent.includes('Updated')
-      }, {}, 'h1')
+      await page.waitForXPath('//h1[contains(text(), "Updated")]')
     }
   )
 })