Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

port: JS Teams Tests#1192

Closed
mdrichardson wants to merge 26 commits intomainfrom
teamsTests
Closed

port: JS Teams Tests#1192
mdrichardson wants to merge 26 commits intomainfrom
teamsTests

Conversation

@mdrichardson
Copy link
Contributor

@mdrichardson mdrichardson commented Jul 7, 2021

This is currently a draft. I'll convert to full PR after the next JS and Components release for the sake of package management.

#minor

Purpose

  1. Add JS Teams package tests
  2. Have .NET and JS share the same .dialog test files

Changes

  1. Move .NET tests from tests/unit/packages/Microsoft.Bot.Components.Teams.Tests to tests\unit\packages\Teams\dotnet to follow the same directory pattern under packages\
  2. Move .dialog test files to ``tests\unit\packages\Teams\Shared Tests`
  3. Add JS tests to tests\unit\packages\Teams\js
  4. Add JS tests to yarn workspaces
  5. Update JS Teams Auth classes to support CloudAdapter
  6. Update JS Teams SendMessageToTeamsChannel to support CloudAdapter. port of this PR

Feature Plan

  1. JS SDK GA Release
  2. Next Components Release

Thomas Chung and others added 16 commits June 28, 2021 13:51
* Add Teams package unit tests (#1171)

* fix: Stevenic/ac fix (#1164)

* Fixed typo in schema for UpdateActivity

* Forgot to copy activityId to outgoing activity in UpdateAdaptiveCard

Co-authored-by: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Co-authored-by: Steven Ickman <stevenic@microsoft.com>
* Update package.json on adaptive + empty

* Update more package depdendency

* Update template package.jsons

* Update yarn.lock

* Update old school csharp skills

* Update Teams, AdaptiveCards package and misc projs

* Update SendMessageToTeamsChannelAsync to work with CloudAdapter (#1170)

* chore: Cherry pick 1171 and 1164 into 4.14 (#1172)

* Add Teams package unit tests (#1171)

* fix: Stevenic/ac fix (#1164)

* Fixed typo in schema for UpdateActivity

* Forgot to copy activityId to outgoing activity in UpdateAdaptiveCard

Co-authored-by: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Co-authored-by: Steven Ickman <stevenic@microsoft.com>

Co-authored-by: Thomas Chung <thchung@microsoft.com>
Co-authored-by: Eric Dahlvang <erdahlva@microsoft.com>
Co-authored-by: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Co-authored-by: Steven Ickman <stevenic@microsoft.com>

> Looks good. Let's document all of the processes to upgrade versions for all types of components in the repo so that others can do the same.
> i.e.
> Generators
> 
> 1. generator-bot-adaptive/package.json - bump version
> 2. generator-bot-_/packagejson (the rest) - bump version and dependencies:@microsoft/generator-bot-_ versions
> 
> Csproj packages
> 
> 1. Bump version of Microsoft.Bot.Builder.* dependencies
> 
> Nuspec packages
> 
> 1. Bump version of Mocrosoft.Bot.Builder.* dependencies
>    Npm packages
> 2. Bump versions of botbuilder dependencies

Good idea. As we figure this out we should just write down the steps.
* Enable SendMessageToTeamsChannel with either BotFrameworkAdapter or CloudAdapter

* Get appId from claims

* Throw if adapter is not a known type to support SendMessageToTeamsChannel
* Update graph package version

* Update graph

* Update Teams package

* Update teams JS package

* Update adaptive cards

* HelpAndCancel

* Update helpandcancel + welcome dependencies

* Change to minor version update

* Update to correct JS preview platform.js
Co-authored-by: Thomas Chung <thchung@microsoft.com>
@pr-triage pr-triage bot added the PR: draft label Jul 7, 2021
@github-actions github-actions bot added the Area: Packages: Teams Relating to the Teams bot component package. label Jul 7, 2021
thomas-chung and others added 3 commits July 7, 2021 09:35
* Fix nuget versioning steps

* Fix Teams test reference

* Fix Microsoft.Bot.Builder.Dialogs.Adaptive.Testing

Co-authored-by: Thomas Chung <thchung@microsoft.com>
mdrichardson and others added 4 commits July 7, 2021 11:20
* initial changes

* Update templates to use preview

Co-authored-by: Thomas Chung <thchung@microsoft.com>
* pull netcore install steps to build-test and package separately

* remove netcore step from signing as it is used in packaging
connectionName: string
): Promise<Partial<Activity>> {
// TODO: Switch to using Cloud OAuth after this PR gets merged: https://github.com/microsoft/botbuilder-js/pull/3149
const userTokenClient = dc.context.turnState.get<UserTokenClient>(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mdrichardson mdrichardson marked this pull request as ready for review July 8, 2021 04:24
@mdrichardson mdrichardson changed the base branch from main to 4.14 July 8, 2021 04:25
@github-actions github-actions bot added Area: Generators: Empty Relating to the Empty Bot Yeoman generator (@microsoft/generator-bot-empty). Area: Generators: Core Language Relating to the Core Bot with Language Yeoman generator (@microsoft/generator-bot-core-language). Area: Generators: Core QnA Relating to the Core Bot with QnA Maker Yeoman generator (@microsoft/generator-bot-core-qna). Area: Generators: Core Assistant Relating to the Core Assistant Bot Yeoman generator (@microsoft/generator-bot-core-assistant). Area: Generators: Enterprise Assistant Relating to the Enterprise Assistant Bot Yeoman generator (@microsoft/generator-bot-enterprise-as... Area: Generators: Enterprise Calendar Relating to the Enterprise Calendar Bot Yeoman generator (@microsoft/generator-bot-enterprise-cal... Area: Generators: Enterprise People Relating to the Enterprise People Bot Yeoman generator (@microsoft/generator-bot-enterprise-people). labels Jul 8, 2021
]
}
],
"selectAction":{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right? These got nothing to do with your tests right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. I switched the PR to merge against 4.14 after forgetting that I had built against main. I'll re-submit the PR after cherry-picking the commits over.

@mdrichardson mdrichardson changed the base branch from 4.14 to main July 8, 2021 15:32
@github-actions github-actions bot added Area: DevOps Related to devops and technical requirements Area: Generators: Adaptive Relating to the Adaptive Bot Yeoman generator (@microsoft/generator-bot-adaptive). Area: Packages: Adaptive Cards Relating to the Adaptive Cards bot component package. Area: Packages: Graph Relating to the Graph bot component package. Area: Packages: Help & Cancel Relating to the Help & Cancel bot component package. Area: Packages: Welcome Relating to the Welcome bot component package. labels Jul 8, 2021
@mdrichardson
Copy link
Contributor Author

Closing in favor of this PR, so it can merge against 4.14

@tracyboehrer tracyboehrer deleted the teamsTests branch July 14, 2022 16:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Area: DevOps Related to devops and technical requirements Area: Generators: Adaptive Relating to the Adaptive Bot Yeoman generator (@microsoft/generator-bot-adaptive). Area: Generators: Core Assistant Relating to the Core Assistant Bot Yeoman generator (@microsoft/generator-bot-core-assistant). Area: Generators: Core Language Relating to the Core Bot with Language Yeoman generator (@microsoft/generator-bot-core-language). Area: Generators: Core QnA Relating to the Core Bot with QnA Maker Yeoman generator (@microsoft/generator-bot-core-qna). Area: Generators: Empty Relating to the Empty Bot Yeoman generator (@microsoft/generator-bot-empty). Area: Generators: Enterprise Assistant Relating to the Enterprise Assistant Bot Yeoman generator (@microsoft/generator-bot-enterprise-as... Area: Generators: Enterprise Calendar Relating to the Enterprise Calendar Bot Yeoman generator (@microsoft/generator-bot-enterprise-cal... Area: Generators: Enterprise People Relating to the Enterprise People Bot Yeoman generator (@microsoft/generator-bot-enterprise-people). Area: Packages: Adaptive Cards Relating to the Adaptive Cards bot component package. Area: Packages: Graph Relating to the Graph bot component package. Area: Packages: Help & Cancel Relating to the Help & Cancel bot component package. Area: Packages: Teams Relating to the Teams bot component package. Area: Packages: Welcome Relating to the Welcome bot component package. PR: draft PR: reviewed-changes-requested PR: unreviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants