From a225032ec73a7ccefcc6a97ede3f006464bc1a72 Mon Sep 17 00:00:00 2001 From: Niall Thomson Date: Wed, 11 Sep 2024 16:59:31 -0700 Subject: [PATCH] chore: Re-named test directory to avoid ignore issues --- .github/workflows/test-util-ci.yml | 10 +++++----- hack/run-tests.sh | 2 +- {test => testing}/Dockerfile | 0 {test => testing}/run.sh | 0 {test => testing}/util/.dockerignore | 0 {test => testing}/util/.gitignore | 0 {test => testing}/util/.npmignore | 0 {test => testing}/util/README.md | 0 {test => testing}/util/package-lock.json | 0 {test => testing}/util/package.json | 0 {test => testing}/util/src/cli.ts | 0 {test => testing}/util/src/lib/gatherer/gatherer.ts | 0 {test => testing}/util/src/lib/markdownsh.ts | 0 {test => testing}/util/src/lib/shell/shell.ts | 0 {test => testing}/util/test-content/_index.md | 0 {test => testing}/util/test-content/basics/_index.md | 0 {test => testing}/util/test-content/basics/empty.md | 0 .../util/test-content/basics/expect-error.md | 0 .../util/test-content/basics/introduction.md | 0 .../util/test-content/basics/multiline.md | 0 .../test-content/basics/tests/hook-expect-error.sh | 0 {test => testing}/util/test-content/hooks/_index.md | 0 .../util/test-content/hooks/introduction.md | 0 .../util/test-content/hooks/tests/hook-suite.sh | 0 .../util/test-content/hooks/tests/hook-test.sh | 0 {test => testing}/util/tests/fixtures/basic/a.md | 0 {test => testing}/util/tests/fixtures/basic/b.md | 0 .../util/tests/fixtures/basic/empty/block.md | 0 .../util/tests/fixtures/basic/empty/index.md | 0 .../util/tests/fixtures/basic/ignoreme.yml | 0 {test => testing}/util/tests/fixtures/basic/index.md | 0 .../util/tests/fixtures/basic/nested/index.md | 0 {test => testing}/util/tests/gatherer.test.ts | 0 {test => testing}/util/tests/markdownsh.test.ts | 0 {test => testing}/util/tsconfig.build.json | 0 {test => testing}/util/tsconfig.json | 0 36 files changed, 6 insertions(+), 6 deletions(-) rename {test => testing}/Dockerfile (100%) rename {test => testing}/run.sh (100%) rename {test => testing}/util/.dockerignore (100%) rename {test => testing}/util/.gitignore (100%) rename {test => testing}/util/.npmignore (100%) rename {test => testing}/util/README.md (100%) rename {test => testing}/util/package-lock.json (100%) rename {test => testing}/util/package.json (100%) rename {test => testing}/util/src/cli.ts (100%) rename {test => testing}/util/src/lib/gatherer/gatherer.ts (100%) rename {test => testing}/util/src/lib/markdownsh.ts (100%) rename {test => testing}/util/src/lib/shell/shell.ts (100%) rename {test => testing}/util/test-content/_index.md (100%) rename {test => testing}/util/test-content/basics/_index.md (100%) rename {test => testing}/util/test-content/basics/empty.md (100%) rename {test => testing}/util/test-content/basics/expect-error.md (100%) rename {test => testing}/util/test-content/basics/introduction.md (100%) rename {test => testing}/util/test-content/basics/multiline.md (100%) rename {test => testing}/util/test-content/basics/tests/hook-expect-error.sh (100%) rename {test => testing}/util/test-content/hooks/_index.md (100%) rename {test => testing}/util/test-content/hooks/introduction.md (100%) rename {test => testing}/util/test-content/hooks/tests/hook-suite.sh (100%) rename {test => testing}/util/test-content/hooks/tests/hook-test.sh (100%) rename {test => testing}/util/tests/fixtures/basic/a.md (100%) rename {test => testing}/util/tests/fixtures/basic/b.md (100%) rename {test => testing}/util/tests/fixtures/basic/empty/block.md (100%) rename {test => testing}/util/tests/fixtures/basic/empty/index.md (100%) rename {test => testing}/util/tests/fixtures/basic/ignoreme.yml (100%) rename {test => testing}/util/tests/fixtures/basic/index.md (100%) rename {test => testing}/util/tests/fixtures/basic/nested/index.md (100%) rename {test => testing}/util/tests/gatherer.test.ts (100%) rename {test => testing}/util/tests/markdownsh.test.ts (100%) rename {test => testing}/util/tsconfig.build.json (100%) rename {test => testing}/util/tsconfig.json (100%) diff --git a/.github/workflows/test-util-ci.yml b/.github/workflows/test-util-ci.yml index afdbbdd4d..2252b96b2 100644 --- a/.github/workflows/test-util-ci.yml +++ b/.github/workflows/test-util-ci.yml @@ -6,7 +6,7 @@ on: branches: - main paths: - - test/util/** + - testing/util/** jobs: test: @@ -22,16 +22,16 @@ jobs: node-version: ${{ env.node_version }} registry-url: "https://registry.npmjs.org" - name: Install NPM packages - working-directory: test/util + working-directory: testing/util run: npm ci - name: Build - working-directory: test/util + working-directory: testing/util run: npm run build - name: Run unit tests - working-directory: test/util + working-directory: testing/util run: | npm test - name: Run test content - working-directory: test/util + working-directory: testing/util run: | npm run exec -- test ./test-content diff --git a/hack/run-tests.sh b/hack/run-tests.sh index 8fbe0dba1..299a7c9ea 100755 --- a/hack/run-tests.sh +++ b/hack/run-tests.sh @@ -37,7 +37,7 @@ container_image='eks-workshop-test' (cd $SCRIPT_DIR/../lab && $CONTAINER_CLI build -q -t eks-workshop-environment .) -(cd $SCRIPT_DIR/../test && $CONTAINER_CLI build -q -t $container_image .) +(cd $SCRIPT_DIR/../testing && $CONTAINER_CLI build -q -t $container_image .) source $SCRIPT_DIR/lib/generate-aws-creds.sh diff --git a/test/Dockerfile b/testing/Dockerfile similarity index 100% rename from test/Dockerfile rename to testing/Dockerfile diff --git a/test/run.sh b/testing/run.sh similarity index 100% rename from test/run.sh rename to testing/run.sh diff --git a/test/util/.dockerignore b/testing/util/.dockerignore similarity index 100% rename from test/util/.dockerignore rename to testing/util/.dockerignore diff --git a/test/util/.gitignore b/testing/util/.gitignore similarity index 100% rename from test/util/.gitignore rename to testing/util/.gitignore diff --git a/test/util/.npmignore b/testing/util/.npmignore similarity index 100% rename from test/util/.npmignore rename to testing/util/.npmignore diff --git a/test/util/README.md b/testing/util/README.md similarity index 100% rename from test/util/README.md rename to testing/util/README.md diff --git a/test/util/package-lock.json b/testing/util/package-lock.json similarity index 100% rename from test/util/package-lock.json rename to testing/util/package-lock.json diff --git a/test/util/package.json b/testing/util/package.json similarity index 100% rename from test/util/package.json rename to testing/util/package.json diff --git a/test/util/src/cli.ts b/testing/util/src/cli.ts similarity index 100% rename from test/util/src/cli.ts rename to testing/util/src/cli.ts diff --git a/test/util/src/lib/gatherer/gatherer.ts b/testing/util/src/lib/gatherer/gatherer.ts similarity index 100% rename from test/util/src/lib/gatherer/gatherer.ts rename to testing/util/src/lib/gatherer/gatherer.ts diff --git a/test/util/src/lib/markdownsh.ts b/testing/util/src/lib/markdownsh.ts similarity index 100% rename from test/util/src/lib/markdownsh.ts rename to testing/util/src/lib/markdownsh.ts diff --git a/test/util/src/lib/shell/shell.ts b/testing/util/src/lib/shell/shell.ts similarity index 100% rename from test/util/src/lib/shell/shell.ts rename to testing/util/src/lib/shell/shell.ts diff --git a/test/util/test-content/_index.md b/testing/util/test-content/_index.md similarity index 100% rename from test/util/test-content/_index.md rename to testing/util/test-content/_index.md diff --git a/test/util/test-content/basics/_index.md b/testing/util/test-content/basics/_index.md similarity index 100% rename from test/util/test-content/basics/_index.md rename to testing/util/test-content/basics/_index.md diff --git a/test/util/test-content/basics/empty.md b/testing/util/test-content/basics/empty.md similarity index 100% rename from test/util/test-content/basics/empty.md rename to testing/util/test-content/basics/empty.md diff --git a/test/util/test-content/basics/expect-error.md b/testing/util/test-content/basics/expect-error.md similarity index 100% rename from test/util/test-content/basics/expect-error.md rename to testing/util/test-content/basics/expect-error.md diff --git a/test/util/test-content/basics/introduction.md b/testing/util/test-content/basics/introduction.md similarity index 100% rename from test/util/test-content/basics/introduction.md rename to testing/util/test-content/basics/introduction.md diff --git a/test/util/test-content/basics/multiline.md b/testing/util/test-content/basics/multiline.md similarity index 100% rename from test/util/test-content/basics/multiline.md rename to testing/util/test-content/basics/multiline.md diff --git a/test/util/test-content/basics/tests/hook-expect-error.sh b/testing/util/test-content/basics/tests/hook-expect-error.sh similarity index 100% rename from test/util/test-content/basics/tests/hook-expect-error.sh rename to testing/util/test-content/basics/tests/hook-expect-error.sh diff --git a/test/util/test-content/hooks/_index.md b/testing/util/test-content/hooks/_index.md similarity index 100% rename from test/util/test-content/hooks/_index.md rename to testing/util/test-content/hooks/_index.md diff --git a/test/util/test-content/hooks/introduction.md b/testing/util/test-content/hooks/introduction.md similarity index 100% rename from test/util/test-content/hooks/introduction.md rename to testing/util/test-content/hooks/introduction.md diff --git a/test/util/test-content/hooks/tests/hook-suite.sh b/testing/util/test-content/hooks/tests/hook-suite.sh similarity index 100% rename from test/util/test-content/hooks/tests/hook-suite.sh rename to testing/util/test-content/hooks/tests/hook-suite.sh diff --git a/test/util/test-content/hooks/tests/hook-test.sh b/testing/util/test-content/hooks/tests/hook-test.sh similarity index 100% rename from test/util/test-content/hooks/tests/hook-test.sh rename to testing/util/test-content/hooks/tests/hook-test.sh diff --git a/test/util/tests/fixtures/basic/a.md b/testing/util/tests/fixtures/basic/a.md similarity index 100% rename from test/util/tests/fixtures/basic/a.md rename to testing/util/tests/fixtures/basic/a.md diff --git a/test/util/tests/fixtures/basic/b.md b/testing/util/tests/fixtures/basic/b.md similarity index 100% rename from test/util/tests/fixtures/basic/b.md rename to testing/util/tests/fixtures/basic/b.md diff --git a/test/util/tests/fixtures/basic/empty/block.md b/testing/util/tests/fixtures/basic/empty/block.md similarity index 100% rename from test/util/tests/fixtures/basic/empty/block.md rename to testing/util/tests/fixtures/basic/empty/block.md diff --git a/test/util/tests/fixtures/basic/empty/index.md b/testing/util/tests/fixtures/basic/empty/index.md similarity index 100% rename from test/util/tests/fixtures/basic/empty/index.md rename to testing/util/tests/fixtures/basic/empty/index.md diff --git a/test/util/tests/fixtures/basic/ignoreme.yml b/testing/util/tests/fixtures/basic/ignoreme.yml similarity index 100% rename from test/util/tests/fixtures/basic/ignoreme.yml rename to testing/util/tests/fixtures/basic/ignoreme.yml diff --git a/test/util/tests/fixtures/basic/index.md b/testing/util/tests/fixtures/basic/index.md similarity index 100% rename from test/util/tests/fixtures/basic/index.md rename to testing/util/tests/fixtures/basic/index.md diff --git a/test/util/tests/fixtures/basic/nested/index.md b/testing/util/tests/fixtures/basic/nested/index.md similarity index 100% rename from test/util/tests/fixtures/basic/nested/index.md rename to testing/util/tests/fixtures/basic/nested/index.md diff --git a/test/util/tests/gatherer.test.ts b/testing/util/tests/gatherer.test.ts similarity index 100% rename from test/util/tests/gatherer.test.ts rename to testing/util/tests/gatherer.test.ts diff --git a/test/util/tests/markdownsh.test.ts b/testing/util/tests/markdownsh.test.ts similarity index 100% rename from test/util/tests/markdownsh.test.ts rename to testing/util/tests/markdownsh.test.ts diff --git a/test/util/tsconfig.build.json b/testing/util/tsconfig.build.json similarity index 100% rename from test/util/tsconfig.build.json rename to testing/util/tsconfig.build.json diff --git a/test/util/tsconfig.json b/testing/util/tsconfig.json similarity index 100% rename from test/util/tsconfig.json rename to testing/util/tsconfig.json