Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d5c74a5
added the rest of conditions
chon219 Nov 25, 2019
232c30d
fixed todo sample to use OnBeginDialog
chon219 Nov 25, 2019
67a284a
removed unused samples
chon219 Nov 25, 2019
28eafc1
removed addRule method
chon219 Nov 25, 2019
f4a7590
merge adaptiveDialog's actions into dialogs
chon219 Nov 26, 2019
66fe5e4
implemented new declarative test framework in adaptive dialogs
chon219 Dec 5, 2019
262ef88
ported declarative tests from dotnet version
chon219 Dec 5, 2019
af4647e
bug fix
chon219 Dec 5, 2019
fc89ea6
Merge branch '4.future' of https://github.com/microsoft/botbuilder-js…
chon219 Dec 9, 2019
21c5e06
refactored DialogStateManager to implement MemoryInterface
chon219 Dec 10, 2019
ba9172a
fixed test cases for DialogStateManager
chon219 Dec 10, 2019
f28fcde
fixed samples to use refactored DialogStateManager
chon219 Dec 10, 2019
ecdde44
getMemorySnapshot is no longer required while evaluating expressions
chon219 Dec 10, 2019
f64fc27
minor changes
chon219 Dec 10, 2019
8946c84
removed dependency to adaptive dialogs in declarative library
chon219 Dec 16, 2019
542ccb6
moved declarative tests to new directory
chon219 Dec 16, 2019
131deaf
Merge branch '4.future' of https://github.com/microsoft/botbuilder-js…
chon219 Dec 17, 2019
13dedd1
replaced resource provider with resource explorer in test runner
chon219 Dec 17, 2019
a83d207
Revert "refactored DialogStateManager to implement MemoryInterface"
chon219 Dec 19, 2019
2d954a4
Revert "fixed test cases for DialogStateManager"
chon219 Dec 19, 2019
6db1930
Revert "fixed samples to use refactored DialogStateManager"
chon219 Dec 19, 2019
27cb58d
Merge branch '4.future' of https://github.com/microsoft/botbuilder-js…
chon219 Dec 20, 2019
5dd3f70
let DialogStateManager implement MemoryInterface
chon219 Dec 20, 2019
3f00390
allow testRunner to exit after running tests
chon219 Dec 20, 2019
6efea7b
Ported declarative tests for actions
chon219 Dec 27, 2019
914db06
cached parsed expressions
chon219 Jan 7, 2020
d3852ea
cached parsed expression for rest of components
chon219 Jan 7, 2020
39b56f5
cached parsed expression in ConfirmInput
chon219 Jan 7, 2020
bdef991
added comment header for conditions
chon219 Jan 7, 2020
038b61c
added comment headers for testing components
chon219 Jan 7, 2020
bc9276e
removed dependency to botframework-expressions in botbuilder-dialogs
chon219 Jan 7, 2020
5f46aab
use cammelCase for enum values
chon219 Jan 7, 2020
a0a6695
removed unneeded SequenceContext check
chon219 Jan 7, 2020
2f0182d
fixed typo
chon219 Jan 7, 2020
3f1ecbe
moved botbuilder-dialogs-adaptive-tests out of adaptive library folder
chon219 Jan 8, 2020
2a25f96
added turnPath constants and implemented error handler
chon219 Jan 8, 2020
799dac5
refactored actions to align with dotnet sdk
chon219 Jan 8, 2020
53f5154
minor changes
chon219 Jan 8, 2020
ebe0d5d
cut off dependency to declarative library in adaptive dialog library
chon219 Jan 8, 2020
9b99bd7
added tests for test script
chon219 Jan 8, 2020
3ad9449
added missing actions
chon219 Jan 8, 2020
d820af4
added tests for actionScope
chon219 Jan 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"libraries/botbuilder-core",
"libraries/botbuilder-dialogs",
"libraries/botbuilder-dialogs-adaptive",
"libraries/botbuilder-dialogs-adaptive-tests",
"libraries/botbuilder-dialogs-declarative",
"libraries/botbuilder-testing",
"libraries/botbuilder-lg",
Expand Down
5 changes: 5 additions & 0 deletions libraries/botbuilder-dialogs-adaptive-tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**/node_modules
/**/.vscode
/**/lib/*
coverage
.nyc_output
21 changes: 21 additions & 0 deletions libraries/botbuilder-dialogs-adaptive-tests/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "botbuilder-dialogs-adaptive-tests",
"version": "1.0.0",
"description": "",
"scripts": {
"test": "tsc && nyc mocha lib/*.test.js"
},
"dependencies": {
"botbuilder-core": "4.1.6",
"botbuilder-dialogs": "4.1.6",
"botbuilder-dialogs-adaptive": "4.1.6",
"botbuilder-dialogs-declarative": "4.1.6",
"botframework-expressions": "~4.1.6"
},
"devDependencies": {
"@types/mocha": "^2.2.47",
"mocha": "^5.2.0"
},
"author": "Microsoft",
"license": "MIT"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"$schema": "../../../../schemas/sdk.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "root",
"triggers": [
{
"$kind": "Microsoft.OnBeginDialog",
"actions": [
{
"$kind": "Microsoft.InitProperty",
"property": "dialog.todo",
"type": "array"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "1"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "2"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "3"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "4"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "5"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "6"
},
{
"$kind": "Microsoft.Foreach",
"itemsProperty": "dialog.todo",
"actions": [
{
"$kind": "Microsoft.IfCondition",
"condition": "dialog.foreach.index > 2",
"actions": [
{
"$kind": "Microsoft.BreakLoop"
}
]
},
{
"$kind": "Microsoft.SendActivity",
"activity": "index is: @{dialog.foreach.index} and value is: @{dialog.foreach.value}"
}
]
},
{
"$kind": "Microsoft.SendActivity",
"activity": "done"
}
]
}
],
"autoEndDialog": true,
"defaultResultProperty": "dialog.result"
},
"script": [
{
"$kind": "Microsoft.Test.UserSays",
"text": "hi"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 0 and value is: 1"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 1 and value is: 2"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 2 and value is: 3"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "done"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"$schema": "../../../../schemas/sdk.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "root",
"triggers": [
{
"$kind": "Microsoft.OnBeginDialog",
"actions": [
{
"$kind": "Microsoft.InitProperty",
"property": "dialog.todo",
"type": "array"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "1"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "2"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "3"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "4"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "5"
},
{
"$kind": "Microsoft.EditArray",
"itemsProperty": "dialog.todo",
"changeType": "push",
"value": "6"
},
{
"$kind": "Microsoft.Foreach",
"itemsProperty": "dialog.todo",
"actions": [
{
"$kind": "Microsoft.IfCondition",
"condition": "(dialog.foreach.value % 2) == 1",
"actions": [
{
"$kind": "Microsoft.ContinueLoop"
}
]
},
{
"$kind": "Microsoft.SendActivity",
"activity": "index is: @{dialog.foreach.index} and value is: @{dialog.foreach.value}"
}
]
},
{
"$kind": "Microsoft.SendActivity",
"activity": "done"
}
]
}
],
"autoEndDialog": true,
"defaultResultProperty": "dialog.result"
},
"script": [
{
"$kind": "Microsoft.Test.UserSays",
"text": "hi"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 1 and value is: 2"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 3 and value is: 4"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "index is: 5 and value is: 6"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "done"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"$schema": "../../../../schemas/sdk.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"triggers": [
{
"$kind": "Microsoft.OnBeginDialog",
"actions": [
{
"$kind": "Microsoft.SetProperty",
"property": "$counter",
"value": "0"
},
{
"id": "target",
"$kind": "Microsoft.IfCondition",
"condition": "$counter > 2",
"actions": [
{
"$type": "Microsoft.EndDialog"
}
]
},
{
"$kind": "Microsoft.SendActivity",
"activity": "@{$counter}"
},
{
"$kind": "Microsoft.SetProperty",
"property": "$counter",
"value": "$counter + 1"
},
{
"$kind": "Microsoft.GotoAction",
"actionId": "target"
}
]
}
]
},
"script": [
{
"$kind": "Microsoft.Test.UserConversationUpdate"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "0"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "1"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "2"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"$schema": "../../../../schemas/sdk.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"triggers": [
{
"$kind": "Microsoft.OnBeginDialog",
"actions": [
{
"$kind": "Microsoft.SetProperty",
"property": "user.counter",
"value": "10"
},
{
"$kind": "Microsoft.IfCondition",
"condition": "user.counter > 0",
"actions": [
{
"$type": "Microsoft.GotoAction",
"actionId": "wherethesundontshine"
}
]
},
{
"$kind": "Microsoft.Test.AssertCondition",
"condition": "false",
"description": "Step after Goto should never be executed!"
}
]
},
{
"$kind": "Microsoft.OnError",
"actions": [
{
"$kind": "Microsoft.SendActivity",
"activity": "error"
}
]
}
]
},
"script": [
{
"$kind": "Microsoft.Test.UserConversationUpdate"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "error"
}
]
}
Loading