Functional -> OrchardCore.Tests.Functional (OrchardCMS#10875)

vmyspace · Dec 13, 2021 · 421c247 · 421c247
1 parent 9293d1f
commit 421c247
Show file tree

Hide file tree

Showing 48 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml
@@ -33,14 +33,14 @@ jobs:
           apt update && apt --only-upgrade install ca-certificates -y
     - name: Functional Tests
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run mvc:test
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: functional-mvc-screenshots
-        path: test/Functional/mvc-tests/cypress/screenshots
+        path: test/OrchardCore.Tests.Functional/mvc-tests/cypress/screenshots
         retention-days: 3
 
   test_functional_cms_sqlite:
@@ -67,15 +67,15 @@ jobs:
           apt update && apt --only-upgrade install ca-certificates -y
     - name: Functional Tests
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: functional-cms-sqlite-failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
         retention-days: 3
 
@@ -119,15 +119,15 @@ jobs:
           apt update && apt --only-upgrade install ca-certificates -y
     - name: Functional Tests
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: functional-cms-postgresql-failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
         retention-days: 3
 
@@ -167,15 +167,15 @@ jobs:
           apt update && apt --only-upgrade install ca-certificates -y
     - name: Functional Tests
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: functional-cms-mysql-failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
         retention-days: 3
 
@@ -214,14 +214,14 @@ jobs:
           apt update && apt --only-upgrade install ca-certificates -y
     - name: Functional Tests
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: functional-cms-mssql-failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
         retention-days: 3
diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Functional Tests
       if: matrix.os == 'ubuntu-latest'
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
@@ -55,6 +55,6 @@ jobs:
       with:
         name: functional-test-failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
   
diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -49,7 +49,7 @@ jobs:
     - name: Functional Tests
       if: matrix.os == 'ubuntu-latest'
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
@@ -58,7 +58,7 @@ jobs:
       with:
         name: Functional Test failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data_Tests/logs
     - name: Deploy preview nuget packages
       if: matrix.os == 'ubuntu-latest'

diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Functional Tests
       if: matrix.os == 'ubuntu-latest'
       run: |
-        cd test/Functional
+        cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
@@ -69,7 +69,7 @@ jobs:
       with:
         name: Functional Test failure
         path: |
-          test/Functional/cms-tests/cypress/screenshots
+          test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data_Tests/logs
     - name: Deploy release NuGet packages
       if: matrix.os == 'ubuntu-latest'

diff --git a/OrchardCore.sln b/OrchardCore.sln
@@ -383,7 +383,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Settings.Core",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.ContentPreview.Abstractions", "src\OrchardCore\OrchardCore.ContentPreview.Abstractions\OrchardCore.ContentPreview.Abstractions.csproj", "{57EA05E8-0275-4163-8FD1-2B244E396F91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.Functional", "test\Functional\OrchardCore.Tests.Functional.csproj", "{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.Functional", "test\OrchardCore.Tests.Functional\OrchardCore.Tests.Functional.csproj", "{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Placements", "src\OrchardCore.Modules\OrchardCore.Placements\OrchardCore.Placements.csproj", "{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}"
 EndProject

diff --git a/test/Functional/.gitignore → test/OrchardCore.Tests.Functional/.gitignore b/test/Functional/.gitignore → test/OrchardCore.Tests.Functional/.gitignore
diff --git a/...ional/OrchardCore.Tests.Functional.csproj → ...ional/OrchardCore.Tests.Functional.csproj b/...ional/OrchardCore.Tests.Functional.csproj → ...ional/OrchardCore.Tests.Functional.csproj
diff --git a/test/Functional/Readme.md → test/OrchardCore.Tests.Functional/Readme.md b/test/Functional/Readme.md → test/OrchardCore.Tests.Functional/Readme.md
diff --git a/test/Functional/cms-tests/cypress.json → ...e.Tests.Functional/cms-tests/cypress.json b/test/Functional/cms-tests/cypress.json → ...e.Tests.Functional/cms-tests/cypress.json
diff --git a/...sts/cypress/integration/000-saas-setup.js → ...sts/cypress/integration/000-saas-setup.js b/...sts/cypress/integration/000-saas-setup.js → ...sts/cypress/integration/000-saas-setup.js
diff --git a/...-tests/cypress/integration/agency-test.js → ...-tests/cypress/integration/agency-test.js b/...-tests/cypress/integration/agency-test.js → ...-tests/cypress/integration/agency-test.js
diff --git a/...ms-tests/cypress/integration/blog-test.js → ...ms-tests/cypress/integration/blog-test.js b/...ms-tests/cypress/integration/blog-test.js → ...ms-tests/cypress/integration/blog-test.js
diff --git a/...ts/cypress/integration/comingsoon-test.js → ...ts/cypress/integration/comingsoon-test.js b/...ts/cypress/integration/comingsoon-test.js → ...ts/cypress/integration/comingsoon-test.js
diff --git a/...ests/cypress/integration/headless-test.js → ...ests/cypress/integration/headless-test.js b/...ests/cypress/integration/headless-test.js → ...ests/cypress/integration/headless-test.js
diff --git a/...ms-tests/cypress/integration/sass-test.js → ...ms-tests/cypress/integration/sass-test.js b/...ms-tests/cypress/integration/sass-test.js → ...ms-tests/cypress/integration/sass-test.js
diff --git a/...tional/cms-tests/cypress/plugins/index.js → ...tional/cms-tests/cypress/plugins/index.js b/...tional/cms-tests/cypress/plugins/index.js → ...tional/cms-tests/cypress/plugins/index.js
diff --git a/...nal/cms-tests/cypress/support/commands.js → ...nal/cms-tests/cypress/support/commands.js b/...nal/cms-tests/cypress/support/commands.js → ...nal/cms-tests/cypress/support/commands.js
diff --git a/...tional/cms-tests/cypress/support/index.js → ...tional/cms-tests/cypress/support/index.js b/...tional/cms-tests/cypress/support/index.js → ...tional/cms-tests/cypress/support/index.js
diff --git a/test/Functional/cypress-commands/.npmignore → ...ts.Functional/cypress-commands/.npmignore b/test/Functional/cypress-commands/.npmignore → ...ts.Functional/cypress-commands/.npmignore
diff --git a/test/Functional/cypress-commands/LICENSE → ...Tests.Functional/cypress-commands/LICENSE b/test/Functional/cypress-commands/LICENSE → ...Tests.Functional/cypress-commands/LICENSE
diff --git a/test/Functional/cypress-commands/README.md → ...sts.Functional/cypress-commands/README.md b/test/Functional/cypress-commands/README.md → ...sts.Functional/cypress-commands/README.md
diff --git a/...Functional/cypress-commands/dist/index.js → ...Functional/cypress-commands/dist/index.js b/...Functional/cypress-commands/dist/index.js → ...Functional/cypress-commands/dist/index.js
diff --git a/...unctional/cypress-commands/dist/index.mjs → ...unctional/cypress-commands/dist/index.mjs b/...unctional/cypress-commands/dist/index.mjs → ...unctional/cypress-commands/dist/index.mjs
diff --git a/...onal/cypress-commands/dist/test-runner.js → ...onal/cypress-commands/dist/test-runner.js b/...onal/cypress-commands/dist/test-runner.js → ...onal/cypress-commands/dist/test-runner.js
diff --git a/...nal/cypress-commands/dist/test-runner.mjs → ...nal/cypress-commands/dist/test-runner.mjs b/...nal/cypress-commands/dist/test-runner.mjs → ...nal/cypress-commands/dist/test-runner.mjs
diff --git a/...Functional/cypress-commands/dist/utils.js → ...Functional/cypress-commands/dist/utils.js b/...Functional/cypress-commands/dist/utils.js → ...Functional/cypress-commands/dist/utils.js
diff --git a/...unctional/cypress-commands/dist/utils.mjs → ...unctional/cypress-commands/dist/utils.mjs b/...unctional/cypress-commands/dist/utils.mjs → ...unctional/cypress-commands/dist/utils.mjs
diff --git a/...tional/cypress-commands/package-lock.json → ...tional/cypress-commands/package-lock.json b/...tional/cypress-commands/package-lock.json → ...tional/cypress-commands/package-lock.json
diff --git a/.../Functional/cypress-commands/package.json → ....Functional/cypress-commands/package.json b/.../Functional/cypress-commands/package.json → ....Functional/cypress-commands/package.json
diff --git a/...ctional/cypress-commands/rollup.config.js → ...ctional/cypress-commands/rollup.config.js b/...ctional/cypress-commands/rollup.config.js → ...ctional/cypress-commands/rollup.config.js
diff --git a/...unctional/cypress-commands/src/buttons.js → ...unctional/cypress-commands/src/buttons.js b/...unctional/cypress-commands/src/buttons.js → ...unctional/cypress-commands/src/buttons.js
diff --git a/...nal/cypress-commands/src/configuration.js → ...nal/cypress-commands/src/configuration.js b/...nal/cypress-commands/src/configuration.js → ...nal/cypress-commands/src/configuration.js
diff --git a/...ional/cypress-commands/src/cySelectors.js → ...ional/cypress-commands/src/cySelectors.js b/...ional/cypress-commands/src/cySelectors.js → ...ional/cypress-commands/src/cySelectors.js
diff --git a/...nctional/cypress-commands/src/features.js → ...nctional/cypress-commands/src/features.js b/...nctional/cypress-commands/src/features.js → ...nctional/cypress-commands/src/features.js
diff --git a/.../Functional/cypress-commands/src/index.js → ....Functional/cypress-commands/src/index.js b/.../Functional/cypress-commands/src/index.js → ....Functional/cypress-commands/src/index.js
diff --git a/...Functional/cypress-commands/src/recipe.js → ...Functional/cypress-commands/src/recipe.js b/...Functional/cypress-commands/src/recipe.js → ...Functional/cypress-commands/src/recipe.js
diff --git a/...unctional/cypress-commands/src/tenants.js → ...unctional/cypress-commands/src/tenants.js b/...unctional/cypress-commands/src/tenants.js → ...unctional/cypress-commands/src/tenants.js
diff --git a/...ional/cypress-commands/src/test-runner.js → ...ional/cypress-commands/src/test-runner.js b/...ional/cypress-commands/src/test-runner.js → ...ional/cypress-commands/src/test-runner.js
diff --git a/test/Functional/cypress-commands/src/urls.js → ...s.Functional/cypress-commands/src/urls.js b/test/Functional/cypress-commands/src/urls.js → ...s.Functional/cypress-commands/src/urls.js
diff --git a/.../Functional/cypress-commands/src/utils.js → ....Functional/cypress-commands/src/utils.js b/.../Functional/cypress-commands/src/utils.js → ....Functional/cypress-commands/src/utils.js
diff --git a/test/Functional/mvc-tests/cypress.json → ...e.Tests.Functional/mvc-tests/cypress.json b/test/Functional/mvc-tests/cypress.json → ...e.Tests.Functional/mvc-tests/cypress.json
diff --git a/...mvc-tests/cypress/integration/mvc-test.js → ...mvc-tests/cypress/integration/mvc-test.js b/...mvc-tests/cypress/integration/mvc-test.js → ...mvc-tests/cypress/integration/mvc-test.js
diff --git a/...tional/mvc-tests/cypress/plugins/index.js → ...tional/mvc-tests/cypress/plugins/index.js b/...tional/mvc-tests/cypress/plugins/index.js → ...tional/mvc-tests/cypress/plugins/index.js
diff --git a/...nal/mvc-tests/cypress/support/commands.js → ...nal/mvc-tests/cypress/support/commands.js b/...nal/mvc-tests/cypress/support/commands.js → ...nal/mvc-tests/cypress/support/commands.js
diff --git a/...tional/mvc-tests/cypress/support/index.js → ...tional/mvc-tests/cypress/support/index.js b/...tional/mvc-tests/cypress/support/index.js → ...tional/mvc-tests/cypress/support/index.js
diff --git a/test/Functional/package-lock.json → ...rdCore.Tests.Functional/package-lock.json b/test/Functional/package-lock.json → ...rdCore.Tests.Functional/package-lock.json
diff --git a/test/Functional/package.json → ...OrchardCore.Tests.Functional/package.json b/test/Functional/package.json → ...OrchardCore.Tests.Functional/package.json
diff --git a/test/Functional/test_generator.js → ...rdCore.Tests.Functional/test_generator.js b/test/Functional/test_generator.js → ...rdCore.Tests.Functional/test_generator.js