Skip to content

Commit

Permalink
chore: testing reorg, devops cleanup (#3860)
Browse files Browse the repository at this point in the history
* chore: move more test code around

- Also remove dead code

* chore: remove unused devops files
  • Loading branch information
Josh Gummersall authored Jul 29, 2021
1 parent 3dc3d7e commit 6821aff
Show file tree
Hide file tree
Showing 287 changed files with 28 additions and 301 deletions.
35 changes: 0 additions & 35 deletions build/yaml/botbuilder-js-api-check.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions build/yaml/botbuilder-js-ci-node12.yml

This file was deleted.

55 changes: 0 additions & 55 deletions build/yaml/botbuilder-js-ci.yml

This file was deleted.

10 changes: 0 additions & 10 deletions build/yaml/templates/test-schemas.yml

This file was deleted.

17 changes: 0 additions & 17 deletions libraries/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,3 @@
|botframework-connector|Stable|
|botframework-schema|Stable|
|botframework-streaming|Stable|

___

## Private/Internal Packages

The following packages are for internal flows such as testing and generating SDK components via Swagger. These packages (or folders) are not published to NPM and should have `"private": true,` in their package.json(s).

|Name|Purpose|CI|
|----|-------|--|
|bot-integration-tests|ChannelServiceHandler tests|Yes|
|browser-functional-tests|botbuilder-core integration test in the chrome|Yes|
|functional-tests|Echo Bot tests|Yes|
|streaming-e2e-tests|BF-DLJS + Web Chat + DL-ASE test|Yes|
|swagger|For generating `schema` & `connector` packages|No|
|teams-scenarios|Collection of test bots for Teams-specific flows|No|
|testbot|Manual CoreBot test project|No|
|testskills|Manual test project|No|
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"build-docs": "wsrun -e -m build-docs",
"clean": "wsrun -m clean",
"depcheck": "wsrun -m -l depcheck",
"dev:link": "wsrun --bin=yarn link",
"dev:unlink": "wsrun --bin=yarn unlink",
"dev:link": "wsrun --if is-not-private --bin=yarn link",
"dev:unlink": "wsrun --if is-not-private --bin=yarn unlink",
"functional-test": "yarn build && yarn workspace functional-tests test",
"lint": "wsrun -m -l lint --quiet",
"package": "wsrun -e -t -l --if is-not-private --bin yarn pack",
Expand Down
10 changes: 0 additions & 10 deletions test-runner/bootstrap.js

This file was deleted.

9 changes: 0 additions & 9 deletions test-runner/index.html

This file was deleted.

130 changes: 0 additions & 130 deletions test-runner/test-builder.js

This file was deleted.

14 changes: 14 additions & 0 deletions testing/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Testing Packages

The following packages are for internal flows such as testing and generating SDK components via Swagger. These packages (or folders) are not published to NPM and should have `"private": true,` in their package.json(s).

|Name|Purpose|CI|
|----|-------|--|
|bot-integration|ChannelServiceHandler tests|Yes|
|browser-functional|botbuilder-core integration test in the chrome|Yes|
|functional|Echo Bot tests|Yes|
|streaming-e2e|BF-DLJS + Web Chat + DL-ASE test|Yes|
|swagger|For generating `schema` & `connector` packages|No|
|teams-scenarios|Collection of test bots for Teams-specific flows|No|
|testbot|Manual CoreBot test project|No|
|skills|Manual test project|No|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ The library **browser-functional-tests** is a suite of tests running with **Nigh

## Run the test locally

_Note: The tests are configured to run in two-terminals, one for the webpack-dev-server which runs the bot, another for running the tests._
_Note: The tests are configured to run in two-terminals, one for the webpack-dev-server which runs the bot, another for running the tests._

1. In the `botbuilder-js` root directory, open a terminal and run `yarn`

2. Go to `libraries/browser-functional-tests/browser-echo-bot`, open a terminal and run the following commands:
2. Go to `testing/browser-functional/browser-echo-bot`, open a terminal and run the following commands:
* `yarn`
* `yarn start`
This command will start the browser bot using `webpack-dev-server`.
Expand All @@ -23,7 +23,7 @@ The next steps will guide you thought the configuration of a Build pipeline base

- Azure DevOps organization. You can find documentation [here](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/create-organization?view=azure-devops).
- Azure subscription. Required to create and delete Azure resources.

### Step by step

1. Create a pipeline using the classic editor, this options allows to us select the YAML file to configure the pipeline.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ steps:
inputs:
versionSpec: 12.x

- script: cd libraries/browser-functional-tests/browser-echo-bot && yarn && yarn build
- script: cd testing/browser-functional/browser-echo-bot && yarn && yarn build
displayName: yarn install and build browser-echo-bot

- powershell: |
# Compress Bot Source Code
cd $(System.DefaultWorkingDirectory)/libraries/browser-functional-tests/browser-echo-bot/dist
$DirToCompress = "$(System.DefaultWorkingDirectory)/libraries/browser-functional-tests/browser-echo-bot/dist"
cd $(System.DefaultWorkingDirectory)/testing/browser-functional/browser-echo-bot/dist
$DirToCompress = "$(System.DefaultWorkingDirectory)/testing/browser-functional/browser-echo-bot/dist"
$files = Get-ChildItem -Path $DirToCompress
$ZipFileResult="$(System.DefaultWorkingDirectory)/libraries/browser-functional-tests/browser-echo-bot/browser-echo-bot.zip"
$ZipFileResult="$(System.DefaultWorkingDirectory)/testing/browser-functional/browser-echo-bot/browser-echo-bot.zip"
Compress-Archive -Path $files -DestinationPath $ZipFileResult
displayName: 'Compress Bot Source Code'

Expand All @@ -52,15 +52,15 @@ steps:
inlineScript: |
echo "# Create resource group"
call az group create -l westus -n "$(TestResourceGroup)" --tags buildName="$(Build.DefinitionName)" cause=automation date="$(DateTimeTag)" product="$(Build.Repository.Name)" sourceBranch="$(Build.SourceBranch)"
echo "# Create app service plan"
call az appservice plan create -g "$(TestResourceGroup)" -n "$(TestAppServicePlan)" --number-of-workers 4 --sku S1
echo "# Create web app"
call az webapp create -g "$(TestResourceGroup)" -p "$(TestAppServicePlan)" -n "$(TestWebApp)"
echo "# Deploy source code"
call az webapp deployment source config-zip --resource-group "$(TestResourceGroup)" --name "$(TestWebApp)" --src "$(System.DefaultWorkingDirectory)/libraries/browser-functional-tests/browser-echo-bot/browser-echo-bot.zip"
call az webapp deployment source config-zip --resource-group "$(TestResourceGroup)" --name "$(TestWebApp)" --src "$(System.DefaultWorkingDirectory)/testing/browser-functional/browser-echo-bot/browser-echo-bot.zip"
- script: yarn
displayName: yarn install
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "transcript-tests",
"private": true,
"version": "1.0.0",
"description": "Bot Builder tests using transcripts.",
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 6821aff

Please sign in to comment.