Move & reorganise test files under tests/

.eslintignore

@@ -6,4 +6,4 @@
 /docs/source/layouts/
 /docs/source/stylesheets/
 /package-lock.json
-/__tests__/yaml-test-suite/
+/tests/yaml-test-suite/

.gitmodules

@@ -1,5 +1,5 @@
-[submodule "__tests__/yaml-test-suite"]
-	path = __tests__/yaml-test-suite
+[submodule "tests/yaml-test-suite"]
+	path = tests/yaml-test-suite
 	url = https://github.com/eemeli/yaml-test-suite.git
 	branch = fixed-data
 [submodule "docs"]

.prettierignore

@@ -6,4 +6,4 @@
 /docs/source/layouts/
 /docs/source/stylesheets/
 /package*.json
-/__tests__/yaml-test-suite/
+/tests/yaml-test-suite/

package.json

@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "build": "babel src/ --out-dir dist/",
-    "prettier": "prettier --write \"{src,__tests__}/**/*.js\"",
+    "prettier": "prettier --write \"{src,tests}/**/*.js\"",
     "lint": "eslint src/",
     "test": "TRACE_LEVEL=log jest",
     "test:trace": "TRACE_LEVEL=trace,log jest --no-cache",
@@ -57,9 +57,12 @@
     ]
   },
   "jest": {
+    "testMatch": [
+      "**/tests/**/*.js"
+    ],
     "testPathIgnorePatterns": [
-      "__tests__/common",
-      "__tests__/cst/common"
+      "tests/common",
+      "tests/cst/common"
     ]
   },
   "prettier": {
@@ -117,8 +120,7 @@
       },
       {
         "files": [
-          "__tests__/*.js",
-          "__tests__/cst/*.js"
+          "tests/**/*.js"
         ],
         "env": {
           "es6": true,

__tests__/YAML-1.2.spec.js → tests/doc/YAML-1.2.spec.js

@@ -1,5 +1,5 @@
-import YAML from '../src/index'
-import { strOptions } from '../src/schema/_string'
+import YAML from '../../src/index'
+import { strOptions } from '../../src/schema/_string'
 
 const spec = {
   '2.1. Collections': {

__tests__/anchors.js → tests/doc/anchors.js

@@ -1,6 +1,6 @@
-import YAML from '../src/index'
-import Map from '../src/schema/Map'
-import Merge from '../src/schema/Merge'
+import YAML from '../../src/index'
+import Map from '../../src/schema/Map'
+import Merge from '../../src/schema/Merge'
 
 test('basic', () => {
   const src = `- &a 1\n- *a\n`

__tests__/collection-access.js → tests/doc/collection-access.js

@@ -1,5 +1,5 @@
-import YAML from '../src/index'
-import Pair from '../src/schema/Pair'
+import YAML from '../../src/index'
+import Pair from '../../src/schema/Pair'
 
 describe('Map', () => {
   let map

__tests__/comments.js → tests/doc/comments.js

@@ -1,4 +1,4 @@
-import YAML from '../src/index'
+import YAML from '../../src/index'
 
 describe('parse comments', () => {
   describe('body', () => {

__tests__/corner-cases.js → tests/doc/corner-cases.js

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
-import Node from '../src/cst/Node'
-import YAML from '../src/index'
+import Node from '../../src/cst/Node'
+import YAML from '../../src/index'
 
 test('eemeli/yaml#2', () => {
   const src = `
@@ -74,7 +74,7 @@ aliases:
 
   test('complete file', () => {
     const src = fs.readFileSync(
-      path.resolve(__dirname, './artifacts/prettier-circleci-config.yml'),
+      path.resolve(__dirname, '../artifacts/prettier-circleci-config.yml'),
       'utf8'
     )
     const doc = YAML.parseDocument(src)

__tests__/createNode.js → tests/doc/createNode.js

@@ -1,9 +1,9 @@
-import YAML from '../src/index'
-import YAMLMap from '../src/schema/Map'
-import Pair from '../src/schema/Pair'
-import Scalar from '../src/schema/Scalar'
-import YAMLSeq from '../src/schema/Seq'
-import { YAMLSet } from '../src/schema/_set'
+import YAML from '../../src/index'
+import YAMLMap from '../../src/schema/Map'
+import Pair from '../../src/schema/Pair'
+import Scalar from '../../src/schema/Scalar'
+import YAMLSeq from '../../src/schema/Seq'
+import { YAMLSet } from '../../src/schema/_set'
 
 describe('scalars', () => {
   describe('createNode(value, false)', () => {

__tests__/foldFlowLines.js → tests/doc/foldFlowLines.js

@@ -1,6 +1,6 @@
-import fold, { FOLD_FLOW, FOLD_QUOTED } from '../src/foldFlowLines'
-import YAML from '../src/index'
-import { strOptions } from '../src/schema/_string'
+import fold, { FOLD_FLOW, FOLD_QUOTED } from '../../src/foldFlowLines'
+import YAML from '../../src/index'
+import { strOptions } from '../../src/schema/_string'
 
 describe('plain', () => {
   const src = 'abc def ghi jkl mno pqr stu vwx yz\n'

__tests__/stringify.js → tests/doc/stringify.js

@@ -1,5 +1,5 @@
-import YAML from '../src/index'
-import { strOptions } from '../src/schema/_string'
+import YAML from '../../src/index'
+import { strOptions } from '../../src/schema/_string'
 
 test('undefined', () => {
   expect(YAML.stringify()).toBe('\n')

__tests__/types.js → tests/doc/types.js

@@ -1,9 +1,9 @@
-import YAML from '../src/index'
-import Scalar from '../src/schema/Scalar'
-import YAMLSeq from '../src/schema/Seq'
-import { YAMLOMap } from '../src/schema/_omap'
-import { YAMLSet } from '../src/schema/_set'
-import { strOptions } from '../src/schema/_string'
+import YAML from '../../src/index'
+import Scalar from '../../src/schema/Scalar'
+import YAMLSeq from '../../src/schema/Seq'
+import { YAMLOMap } from '../../src/schema/_omap'
+import { YAMLSet } from '../../src/schema/_set'
+import { strOptions } from '../../src/schema/_string'
 
 let origFoldOptions