testing-library · Oct 31, 2020 · Nov 1, 2020 · Nov 14, 2020 · Nov 14, 2020 · Nov 14, 2020
diff --git a/.editorconfig b/.editorconfig
@@ -6,4 +6,4 @@ indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
+insert_final_newline = true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,7 @@ assignees: ''
 <!-- Thanks for your interest in the project. We appreciate bugs filed and PRs submitted! -->
 
 <!--
-- For questions related to using the library, please join the Discord server (https://testing-library.com/discord) instead of filing an issue on GitHub.
+- For questions related to using the library, please join the Discord server (https://discord.gg/testing-library) instead of filing an issue on GitHub.
 
 - Please fill out this template with all the relevant information so we can
   understand what's going on and fix the issue.

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -4,7 +4,7 @@ on:
     branches:
       [
         '+([0-9])?(.{+([0-9]),x}).x',
-        'master',
+        'main',
         'next',
         'next-major',
         'beta',
@@ -47,12 +47,9 @@ jobs:
     runs-on: ubuntu-latest
     if:
       ${{ github.repository == 'testing-library/vue-testing-library' &&
-      contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
+      contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
       github.ref) && github.event_name == 'push' }}
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.0
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v2
 
@@ -76,7 +73,7 @@ jobs:
           branches: |
             [
               '+([0-9])?(.{+([0-9]),x}).x',
-              'master',
+              'main',
               'next',
               'next-major',
               {name: 'beta', prerelease: true},

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
     height="80"
     width="80"
     alt="lizard"
-    src="https://raw.githubusercontent.com/testing-library/vue-testing-library/master/lizard.png"
+    src="https://raw.githubusercontent.com/testing-library/vue-testing-library/main/lizard.png"
   />
 </a>
 
@@ -71,6 +71,13 @@ This library has `peerDependencies` listings for `Vue 3` and
 You may also be interested in installing `jest-dom` so you can use [the custom
 Jest matchers][jest-dom].
 
+If you're using Vue 2, please install version 5 of the library:
+
+```
+npm install --save-dev @testing-library/vue@^5
+```
+
+
 ## A basic example
 
 ```html

diff --git a/src/__tests__/simple-button.js → src/__tests__/button-simple.js b/src/__tests__/simple-button.js → src/__tests__/button-simple.js
diff --git a/src/__tests__/slots.js → src/__tests__/card-slots.js b/src/__tests__/slots.js → src/__tests__/card-slots.js
diff --git a/src/__tests__/visibility.js → src/__tests__/collapsible-visibility.js b/src/__tests__/visibility.js → src/__tests__/collapsible-visibility.js
diff --git a/src/__tests__/components/Form.vue b/src/__tests__/components/Form.vue
@@ -58,7 +58,6 @@ export default {
   methods: {
     submit() {
       if (this.submitDisabled) return
-
       this.$emit('submit', {
         title: this.title,
         review: this.review,

diff --git a/src/__tests__/components/NumberDisplay.vue b/src/__tests__/components/NumberDisplay.vue
@@ -1,22 +1,22 @@
-<template>
-  <span data-testid="number-display">{{ number }}</span>
-  <span data-testid="instance-id">{{ id }}</span>
-</template>
-
-<script>
-let idCounter = 1
-
-export default {
-  props: {
-    number: {
-      type: Number,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      id: idCounter++,
-    }
-  },
-}
-</script>
+<template>
+  <span data-testid="number-display">{{ number }}</span>
+  <span data-testid="instance-id">{{ id }}</span>
+</template>
+
+<script>
+let idCounter = 1
+
+export default {
+  props: {
+    number: {
+      type: Number,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      id: idCounter++,
+    }
+  },
+}
+</script>
diff --git a/src/__tests__/components/VueApollo/queries.js b/src/__tests__/components/VueApollo/queries.js
@@ -15,4 +15,4 @@ export const updateUserMutation = gql`
       email
     }
   }
-`
+`
diff --git a/src/__tests__/disappearance.js b/src/__tests__/disappearance.js
@@ -11,7 +11,7 @@ test('waits for the data to be loaded', async () => {
 
   // Following line reads as follows:
   // "Wait until element with text 'Loading...' is gone."
-  await waitForElementToBeRemoved(getByText('Loading...'))
+  await waitForElementToBeRemoved(queryByText('Loading...'))
   // It is equivalent to:
   //
   // await waitFor(() => {

diff --git a/src/__tests__/axios-mock.js → src/__tests__/fetch-axios-mock.js b/src/__tests__/axios-mock.js → src/__tests__/fetch-axios-mock.js
diff --git a/src/__tests__/functional.js → src/__tests__/functional-sfc.js b/src/__tests__/functional.js → src/__tests__/functional-sfc.js
diff --git a/src/__tests__/debug.js → src/__tests__/hello-world-debug.js b/src/__tests__/debug.js → src/__tests__/hello-world-debug.js
diff --git a/src/__tests__/vue-i18n.js → src/__tests__/translations-vue-i18n.js b/src/__tests__/vue-i18n.js → src/__tests__/translations-vue-i18n.js
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -43,7 +43,8 @@ interface VueTestingLibraryRenderOptions {
   container?: Element
   baseElement?: Element
 }
-export type RenderOptions = VueTestingLibraryRenderOptions & VueTestUtilsRenderOptions
+export type RenderOptions = VueTestingLibraryRenderOptions &
+  VueTestUtilsRenderOptions
 
 export function render(
   TestComponent: any, // this makes me sad :sob:
-Original file line number
+Diff line change
@@ @@ -15,4 +15,4 @@ export const updateUserMutation = gql` @@
           email
         }
       }
-    `
+    `