Skip to content

[Typescript] enhance testing suite #6865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
almedina-ms merged 18 commits into from
Jan 10, 2022
Merged

[Typescript] enhance testing suite #6865

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d5e8b17
Refactor a lot of code
almedina-ms Dec 17, 2021
e2d4fed
Fix more tests
almedina-ms Jan 3, 2022
a079a62
Add support for more elements
almedina-ms Jan 3, 2022
82b8952
Add more tests for other elements
almedina-ms Jan 4, 2022
1d5f8c4
Merge branch 'main' into user/almedina-ms/JS_EnhanceTestingSuite
almedina-ms Jan 4, 2022
469d81c
Fix toggle input behaviour
almedina-ms Jan 4, 2022
13f6a40
Add test for showcard
almedina-ms Jan 4, 2022
e81d91f
Merge branch 'user/almedina-ms/JS_EnhanceTestingSuite' of https://git…
almedina-ms Jan 4, 2022
0b72a2e
Add more functions
almedina-ms Jan 7, 2022
287de9b
Last update
almedina-ms Jan 7, 2022
54dc94a
Merge branch 'main' into user/almedina-ms/JS_EnhanceTestingSuite
almedina-ms Jan 7, 2022
87c5f62
Move setData to input
almedina-ms Jan 7, 2022
ec63729
Merge branch 'user/almedina-ms/JS_EnhanceTestingSuite' of https://git…
almedina-ms Jan 7, 2022
b5493d6
Fix build failure
almedina-ms Jan 7, 2022
495b445
Resolve small nit
almedina-ms Jan 7, 2022
173f918
Update a couple more lines
almedina-ms Jan 7, 2022
8b0ce84
Merge branch 'main' into user/almedina-ms/JS_EnhanceTestingSuite
almedina-ms Jan 7, 2022
d85bf2d
Merge branch 'main' into user/almedina-ms/JS_EnhanceTestingSuite
almedina-ms Jan 10, 2022
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
4 changes: 2 additions & 2 deletions samples/v1.0/Elements/Column.SelectAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"selectAction": {
"type": "Action.OpenUrl",
"tooltip": "cool link",
"tooltip": "another cool link",
"url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
}
},
Expand All @@ -61,7 +61,7 @@
],
"selectAction": {
"type": "Action.OpenUrl",
"tooltip": "cool link",
"tooltip": "a third cool link",
"url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
}
}
Expand Down
13 changes: 12 additions & 1 deletion source/nodejs/adaptivecards-designer-app/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
<!doctype html><html><head><title>Adaptive Cards Designer</title><script defer="defer" src="adaptivecards-designer-app.min.js"></script><link href="adaptivecards-designer-app.css" rel="stylesheet"></head><body><div id="designerRootHost"></div></body></html>
<!DOCTYPE html>
<html>

<head>
<title>Adaptive Cards Designer</title>
<script defer src="adaptivecards-designer-app.js"></script></head>

<body>
<div id="designerRootHost"></div>
</body>

</html>
7 changes: 6 additions & 1 deletion source/nodejs/adaptivecards-ui-testapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ <h1>Adaptive Cards UI Test App</h1>
<div id="renderedCardSpace"> </div>
</div>

<div id="retrievedInputsDiv"></div>
<div class="inputsDiv" id="inputsDiv">
<div id="hideInputsDiv">
<button id="hideInputsBtn">Hide Inputs</button>
</div>
<div id="retrievedInputsDiv"></div>
</div>
</div>
</div>

Expand Down
17 changes: 14 additions & 3 deletions source/nodejs/adaptivecards-ui-testapp/src/adaptivecards-ui-testapp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ body {
}

.main {
width: 80vw;
width: 60vw;
height: 100vh;
}

.testCasesDiv {
width: 20vw;
width: 40vw;
height: 100vh;
}

Expand All @@ -31,13 +31,24 @@ body {
height: 80vh;
}

#retrievedInputsDiv
.inputsDiv
{
display: flex;
width: 100vw;
height: 20vh;
background-color: rgb(240, 238, 238);
}

#hideInputsDiv
{
width: 10vw;
}

#retrievedInputsDiv
{
width: 90vw;
}

#renderedCardSpace
{
width: 600px;
Expand Down
9 changes: 9 additions & 0 deletions source/nodejs/adaptivecards-ui-testapp/src/adaptivecards-ui-testapp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ function renderTestCasesList() {
});
}

function hideInputsDiv()
{
let testCaseListElement = document.getElementById("retrievedInputsDiv");
testCaseListElement.style.visibility = "hidden";
}

window.onload = () => {
renderTestCasesList();

Expand Down Expand Up @@ -47,4 +53,7 @@ window.onload = () => {
};

renderCard(card, cardRenderedCallback);

const hideInputsButton = document.getElementById("hideInputsBtn");
hideInputsButton.click = () => { hideInputsDiv(); };
}
14 changes: 12 additions & 2 deletions source/nodejs/adaptivecards-ui-testapp/src/file-retriever-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
const v10TestCases: string[] = ['Scenarios/ActivityUpdate'];
const v10TestCases: string[] = [
'Scenarios/ActivityUpdate',
'Elements/Container.SelectAction',
'Elements/Column.SelectAction',
'Elements/ColumnSet.SelectAction'];
const v11TestCases: string[] = [];
const v12TestCases: string[] = [];
const v13TestCases: string[] = ['Elements/Input.Text.ErrorMessage'];
const v13TestCases: string[] = [
'Elements/Input.Text.ErrorMessage',
'Elements/Input.Number.ErrorMessage',
'Elements/Input.ChoiceSet.ErrorMessage',
'Elements/Input.Time.ErrorMessage',
'Elements/Input.Toggle.ErrorMessage'
];
const v14TestCases: string[] = [];
const v15TestCases: string[] = [];
const v16TestCases: string[] = [
Expand Down
20 changes: 15 additions & 5 deletions source/nodejs/adaptivecards-ui-testapp/src/rendering-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
import { getTestCasesList } from "./file-retriever-utils";
import { Action, AdaptiveCard, ExecuteAction, HostConfig, IMarkdownProcessingResult, Input, OpenUrlAction, SerializationContext, SubmitAction, Version, Versions } from "adaptivecards";
import { Action, AdaptiveCard, ExecuteAction, HostConfig, IMarkdownProcessingResult, Input, OpenUrlAction, PropertyBag, SerializationContext, SubmitAction, Version, Versions } from "adaptivecards";
import * as Remarkable from "remarkable";

export function listAllFiles(): HTMLLIElement[] {
Expand Down Expand Up @@ -33,8 +33,8 @@ export function listAllFiles(): HTMLLIElement[] {
}

export async function readAndRenderCard(fileName: string, callbackFunction: Function) {
const retrievedInputsDiv: HTMLElement = document.getElementById("renderedCardSpace");
retrievedInputsDiv.style.visibility = "hidden";
const renderedCardSpaceDiv: HTMLElement = document.getElementById("renderedCardSpace");
renderedCardSpaceDiv.style.visibility = "hidden";

const response = await fetch(`samples/${fileName}`);

Expand All @@ -59,8 +59,6 @@ export async function readAndRenderCard(fileName: string, callbackFunction: Func
}

renderCard(jsonToRender, callbackFunction);

retrievedInputsDiv.style.visibility = "visible";
}

export function renderCard(cardJson: any, callbackFunction: Function): void {
Expand Down Expand Up @@ -89,6 +87,16 @@ export function renderCard(cardJson: any, callbackFunction: Function): void {
inputsMap[input.id] = input.value;
});

if (actionType === SubmitAction.JsonTypeName)
{
const submitAction: SubmitAction = action as SubmitAction;

for (let [key, value] of Object.entries(submitAction.data))
{
inputsMap[key] = value;
}
}

inputsAsJson = JSON.stringify(inputsMap);
}
else if (actionType === OpenUrlAction.JsonTypeName) {
Expand All @@ -98,6 +106,7 @@ export function renderCard(cardJson: any, callbackFunction: Function): void {

const retrievedInputsDiv: HTMLElement = document.getElementById("retrievedInputsDiv");
retrievedInputsDiv.innerHTML = inputsAsJson;
retrievedInputsDiv.style.visibility = "visible";
};

// For markdown support you need a third-party library
Expand All @@ -122,4 +131,5 @@ export function cardRenderedCallback(renderedCard: HTMLElement) {
const renderedCardDiv = document.getElementById("renderedCardSpace");
renderedCardDiv.innerHTML = "";
renderedCardDiv.appendChild(renderedCard);
renderedCardDiv.style.visibility = "visible";
}
Loading