test(e2e): extract e2eUtils + test both api styles of todomvc

diff --git a/packages/vue/examples/__tests__/e2eUtils.ts b/packages/vue/examples/__tests__/e2eUtils.ts
new file mode 100644 (file)
index 0000000..8fb8e73
--- /dev/null
+++ b/packages/vue/examples/__tests__/e2eUtils.ts
@@ -0,0 +1,79 @@
+import puppeteer from 'puppeteer'
+
+const puppeteerOptions = process.env.CI
+  ? { args: ['--no-sandbox', '--disable-setuid-sandbox'] }
+  : {}
+
+export function setupPuppeteer() {
+  let browser: puppeteer.Browser
+  let page: puppeteer.Page
+
+  beforeEach(async () => {
+    browser = await puppeteer.launch(puppeteerOptions)
+    page = await browser.newPage()
+  })
+
+  afterEach(async () => {
+    await browser.close()
+  })
+
+  async function click(selector: string, options?: puppeteer.ClickOptions) {
+    await page.click(selector, options)
+  }
+
+  async function count(selector: string) {
+    return (await page.$$(selector)).length
+  }
+
+  async function text(selector: string) {
+    return await page.$eval(selector, node => node.textContent)
+  }
+
+  async function value(selector: string) {
+    return await page.$eval(selector, (node: any) => node.value)
+  }
+
+  async function isVisible(selector: string) {
+    const display = await page.$eval(selector, (node: HTMLElement) => {
+      return window.getComputedStyle(node).display
+    })
+    return display !== 'none'
+  }
+
+  async function isChecked(selector: string) {
+    return await page.$eval(selector, (node: any) => node.checked)
+  }
+
+  async function classList(selector: string) {
+    return await page.$eval(selector, (node: any) => [...node.classList])
+  }
+
+  async function isFocused(selector: string) {
+    return await page.$eval(selector, node => node === document.activeElement)
+  }
+
+  async function enterValue(selector: string, value: string) {
+    const el = (await page.$(selector))!
+    await el.evaluate((node: any) => (node.value = ''))
+    await el.type(value)
+    await el.press('Enter')
+  }
+
+  async function clearValue(selector: string) {
+    return await page.$eval(selector, (node: any) => (node.value = ''))
+  }
+
+  return {
+    page: () => page,
+    click,
+    count,
+    text,
+    value,
+    classList,
+    isVisible,
+    isChecked,
+    isFocused,
+    enterValue,
+    clearValue
+  }
+}

diff --git a/packages/vue/examples/__tests__/todomvc.spec.ts b/packages/vue/examples/__tests__/todomvc.spec.ts
index a544b58dcc6228d8e802a881c043cc72ea1443d5..a9df1dd5bc2b91c5fbbef2a739528dc0abb89d21 100644 (file)
--- a/packages/vue/examples/__tests__/todomvc.spec.ts
+++ b/packages/vue/examples/__tests__/todomvc.spec.ts
@@ -1,34 +1,42 @@
 import path from 'path'
-import puppeteer from 'puppeteer'
-
-const puppeteerOptions = process.env.CI
-  ? { args: ['--no-sandbox', '--disable-setuid-sandbox'] }
-  : {}
-
-let browser: puppeteer.Browser
-let page: puppeteer.Page
-
-describe('e2e', () => {
-  beforeEach(async () => {
-    browser = await puppeteer.launch(puppeteerOptions)
-    page = await browser.newPage()
-  })
-
-  afterEach(async () => {
-    await browser.close()
-  })
-
-  test('todomvc', async () => {
-    await page.goto(
-      `file://${path.resolve(__dirname, '../classic/todomvc.html')}`
-    )
+import { setupPuppeteer } from './e2eUtils'
+
+describe('e2e: todomvc', () => {
+  const {
+    page,
+    click,
+    isVisible,
+    count,
+    text,
+    value,
+    isChecked,
+    isFocused,
+    classList,
+    enterValue,
+    clearValue
+  } = setupPuppeteer()
+
+  async function removeItemAt(n: number) {
+    const item = (await page().$('.todo:nth-child(' + n + ')'))!
+    const itemBBox = (await item.boundingBox())!
+    await page().mouse.move(itemBBox.x + 10, itemBBox.y + 10)
+    await click('.todo:nth-child(' + n + ') .destroy')
+  }
+
+  async function testTodomvc(apiType: 'classic' | 'composition') {
+    const baseUrl = `file://${path.resolve(
+      __dirname,
+      `../${apiType}/todomvc.html`
+    )}`
+
+    await page().goto(baseUrl)
     expect(await isVisible('.main')).toBe(false)
     expect(await isVisible('.footer')).toBe(false)
     expect(await count('.filters .selected')).toBe(1)
     expect(await text('.filters .selected')).toBe('All')
     expect(await count('.todo')).toBe(0)
 
-    await createNewItem('test')
+    await enterValue('.new-todo', 'test')
     expect(await count('.todo')).toBe(1)
     expect(await isVisible('.todo .edit')).toBe(false)
     expect(await text('.todo label')).toBe('test')
@@ -39,31 +47,31 @@ describe('e2e', () => {
     expect(await isVisible('.clear-completed')).toBe(false)
     expect(await value('.new-todo')).toBe('')
 
-    await createNewItem('test2')
+    await enterValue('.new-todo', 'test2')
     expect(await count('.todo')).toBe(2)
     expect(await text('.todo:nth-child(2) label')).toBe('test2')
     expect(await text('.todo-count strong')).toBe('2')
 
     // toggle
-    await page.click('.todo .toggle')
+    await click('.todo .toggle')
     expect(await count('.todo.completed')).toBe(1)
     expect(await classList('.todo:nth-child(1)')).toContain('completed')
     expect(await text('.todo-count strong')).toBe('1')
     expect(await isVisible('.clear-completed')).toBe(true)
 
-    await createNewItem('test3')
+    await enterValue('.new-todo', 'test3')
     expect(await count('.todo')).toBe(3)
     expect(await text('.todo:nth-child(3) label')).toBe('test3')
     expect(await text('.todo-count strong')).toBe('2')
 
-    await createNewItem('test4')
-    await createNewItem('test5')
+    await enterValue('.new-todo', 'test4')
+    await enterValue('.new-todo', 'test5')
     expect(await count('.todo')).toBe(5)
     expect(await text('.todo-count strong')).toBe('4')
 
     // toggle more
-    await page.click('.todo:nth-child(4) .toggle')
-    await page.click('.todo:nth-child(5) .toggle')
+    await click('.todo:nth-child(4) .toggle')
+    await click('.todo:nth-child(5) .toggle')
     expect(await count('.todo.completed')).toBe(3)
     expect(await text('.todo-count strong')).toBe('2')
 
@@ -78,7 +86,7 @@ describe('e2e', () => {
     expect(await text('.todo-count strong')).toBe('1')
 
     // remove all
-    await page.click('.clear-completed')
+    await click('.clear-completed')
     expect(await count('.todo')).toBe(1)
     expect(await text('.todo label')).toBe('test2')
     expect(await count('.todo.completed')).toBe(0)
@@ -86,137 +94,86 @@ describe('e2e', () => {
     expect(await isVisible('.clear-completed')).toBe(false)
 
     // prepare to test filters
-    await createNewItem('test')
-    await createNewItem('test')
-    await page.click('.todo:nth-child(2) .toggle')
-    await page.click('.todo:nth-child(3) .toggle')
+    await enterValue('.new-todo', 'test')
+    await enterValue('.new-todo', 'test')
+    await click('.todo:nth-child(2) .toggle')
+    await click('.todo:nth-child(3) .toggle')
 
     // active filter
-    await page.click('.filters li:nth-child(2) a')
+    await click('.filters li:nth-child(2) a')
     expect(await count('.todo')).toBe(1)
     expect(await count('.todo.completed')).toBe(0)
     // add item with filter active
-    await createNewItem('test')
+    await enterValue('.new-todo', 'test')
     expect(await count('.todo')).toBe(2)
 
     // completed filter
-    await page.click('.filters li:nth-child(3) a')
+    await click('.filters li:nth-child(3) a')
     expect(await count('.todo')).toBe(2)
     expect(await count('.todo.completed')).toBe(2)
 
     // filter on page load
-    await page.goto(
-      `file://${path.resolve(__dirname, '../classic/todomvc.html#active')}`
-    )
+    await page().goto(`${baseUrl}#active`)
     expect(await count('.todo')).toBe(2)
     expect(await count('.todo.completed')).toBe(0)
     expect(await text('.todo-count strong')).toBe('2')
 
     // completed on page load
-    await page.goto(
-      `file://${path.resolve(__dirname, '../classic/todomvc.html#completed')}`
-    )
+    await page().goto(`${baseUrl}#completed`)
     expect(await count('.todo')).toBe(2)
     expect(await count('.todo.completed')).toBe(2)
     expect(await text('.todo-count strong')).toBe('2')
 
     // toggling with filter active
-    await page.click('.todo .toggle')
+    await click('.todo .toggle')
     expect(await count('.todo')).toBe(1)
-    await page.click('.filters li:nth-child(2) a')
+    await click('.filters li:nth-child(2) a')
     expect(await count('.todo')).toBe(3)
-    await page.click('.todo .toggle')
+    await click('.todo .toggle')
     expect(await count('.todo')).toBe(2)
 
     // editing triggered by blur
-    await page.click('.filters li:nth-child(1) a')
-    await page.click('.todo:nth-child(1) label', { clickCount: 2 })
+    await click('.filters li:nth-child(1) a')
+    await click('.todo:nth-child(1) label', { clickCount: 2 })
     expect(await count('.todo.editing')).toBe(1)
     expect(await isFocused('.todo:nth-child(1) .edit')).toBe(true)
     await clearValue('.todo:nth-child(1) .edit')
-    await page.type('.todo:nth-child(1) .edit', 'edited!')
-    await page.click('.new-todo') // blur
+    await page().type('.todo:nth-child(1) .edit', 'edited!')
+    await click('.new-todo') // blur
     expect(await count('.todo.editing')).toBe(0)
     expect(await text('.todo:nth-child(1) label')).toBe('edited!')
 
     // editing triggered by enter
-    await page.click('.todo label', { clickCount: 2 })
+    await click('.todo label', { clickCount: 2 })
     await enterValue('.todo:nth-child(1) .edit', 'edited again!')
     expect(await count('.todo.editing')).toBe(0)
     expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
 
     // cancel
-    await page.click('.todo label', { clickCount: 2 })
+    await click('.todo label', { clickCount: 2 })
     await clearValue('.todo:nth-child(1) .edit')
-    await page.type('.todo:nth-child(1) .edit', 'edited!')
-    await page.keyboard.press('Escape')
+    await page().type('.todo:nth-child(1) .edit', 'edited!')
+    await page().keyboard.press('Escape')
     expect(await count('.todo.editing')).toBe(0)
     expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
 
     // empty value should remove
-    await page.click('.todo label', { clickCount: 2 })
+    await click('.todo label', { clickCount: 2 })
     await enterValue('.todo:nth-child(1) .edit', ' ')
     expect(await count('.todo')).toBe(3)
 
     // toggle all
-    await page.click('.toggle-all+label')
+    await click('.toggle-all+label')
     expect(await count('.todo.completed')).toBe(3)
-    await page.click('.toggle-all+label')
+    await click('.toggle-all+label')
     expect(await count('.todo:not(.completed)')).toBe(3)
+  }
+
+  test('classic', async () => {
+    await testTodomvc('classic')
   })
-})
 
-async function isVisible(selector: string) {
-  const display = await page.$eval(selector, (node: HTMLElement) => {
-    return window.getComputedStyle(node).display
+  test('composition', async () => {
+    await testTodomvc('composition')
   })
-  return display !== 'none'
-}
-
-async function isChecked(selector: string) {
-  return await page.$eval(selector, (node: any) => node.checked)
-}
-
-async function count(selector: string) {
-  return (await page.$$(selector)).length
-}
-
-async function text(selector: string) {
-  return await page.$eval(selector, node => node.textContent)
-}
-
-async function value(selector: string) {
-  return await page.$eval(selector, (node: any) => node.value)
-}
-
-async function classList(selector: string) {
-  return await page.$eval(selector, (node: any) => [...node.classList])
-}
-
-async function isFocused(selector: string) {
-  return await page.$eval(selector, node => node === document.activeElement)
-}
-
-async function clearValue(selector: string) {
-  return await page.$eval(selector, (node: any) => (node.value = ''))
-}
-
-async function enterValue(selector: string, value: string) {
-  const el = (await page.$(selector))!
-  await el.evaluate((node: any) => (node.value = ''))
-  await el.type(value)
-  await el.press('Enter')
-}
-
-async function createNewItem(text: string) {
-  const el = (await page.$('.new-todo'))!
-  await el.type(text)
-  await el.press('Enter')
-}
-
-async function removeItemAt(n: number) {
-  const item = (await page.$('.todo:nth-child(' + n + ')'))!
-  const itemBBox = (await item.boundingBox())!
-  await page.mouse.move(itemBBox.x + 10, itemBBox.y + 10)
-  await page.click('.todo:nth-child(' + n + ') .destroy')
-}
+})

diff --git a/packages/vue/examples/composition/todomvc.html b/packages/vue/examples/composition/todomvc.html
index 0fba33f063dccc12bbb4a46df0c6002fdd4068fc..7a9de2813230d2e3fd581b71b50f47c6388e79ad 100644 (file)
--- a/packages/vue/examples/composition/todomvc.html
+++ b/packages/vue/examples/composition/todomvc.html
@@ -11,7 +11,7 @@
               v-model="state.newTodo"
               @keyup.enter="addTodo">
     </header>
-    <section class="main" v-if="state.todos.length">
+    <section class="main" v-show="state.todos.length">
       <input id="toggle-all" class="toggle-all" type="checkbox" v-model="state.allDone">
       <label for="toggle-all">Mark all as complete</label>
       <ul class="todo-list">
@@ -34,7 +34,7 @@
         </li>
       </ul>
     </section>
-    <footer class="footer" v-if="state.todos.length">
+    <footer class="footer" v-show="state.todos.length">
         <span class="todo-count">
           <strong>{{ state.remaining }}</strong>
           <span>{{ state.remainingText }}</span>
@@ -45,7 +45,7 @@
         <li><a href="#/completed" :class="{ selected: state.visibility === 'completed' }">Completed</a></li>
       </ul>
 
-      <button class="clear-completed" @click="removeCompleted" v-if="state.todos.length > state.remaining">
+      <button class="clear-completed" @click="removeCompleted" v-show="state.todos.length > state.remaining">
         Clear completed
       </button>
     </footer>