Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
51b33db
Added schema for bot project support
Jul 29, 2020
8d58b7c
Added support to handle botproject space
Sep 17, 2020
7041fd3
More updates
Sep 18, 2020
e94c5f5
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Sep 18, 2020
425df2e
temp
Sep 18, 2020
c64ecf2
Backup
Sep 21, 2020
29044a0
More updates
Sep 24, 2020
d20ce8e
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Sep 24, 2020
28f917c
More updates
Sep 24, 2020
0b6aa25
update the recoil to 0.0.13
lei9444 Sep 25, 2020
1230a20
fix lint
lei9444 Sep 25, 2020
bee0818
remove @type/recoil
lei9444 Sep 25, 2020
5b4e928
Merge branch 'main' into recoil
cwhitten Sep 25, 2020
d491bac
router work
Sep 25, 2020
671bf84
Merge branch 'recoil' of https://github.com/lei9444/BotFramework-Comp…
Sep 25, 2020
40f8661
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Sep 29, 2020
cb0c67e
Bot Project file
Sep 27, 2020
f105aea
Migrate to old desing page and project tree
Oct 2, 2020
48d7f0b
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 2, 2020
9aa46ca
Revert usage of React 16.13.1 to 16.13.0
Oct 2, 2020
98c60d6
Revert "Revert usage of React 16.13.1 to 16.13.0"
Oct 2, 2020
6d76657
Rename api handlers
Oct 2, 2020
7588efb
Merge branch 'main' into srravich/botproject-file-handler
srinaath Oct 3, 2020
86d7443
Add existing skill tests passing
Oct 3, 2020
955bab7
Merge branch 'srravich/botproject-file-handler' of https://github.com…
Oct 3, 2020
308e392
Add 1.0 botproject schema
Oct 4, 2020
b98e1fa
Fix typo
Oct 4, 2020
26581e2
Manifest tests updated
Oct 4, 2020
7e4f5d0
Removed code for bot migration
Oct 6, 2020
9d5bbc6
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 6, 2020
493c604
Server side tests added
Oct 6, 2020
12648f7
Updated schema url to the correct one
Oct 6, 2020
fc707fe
Fix lint and update schema url on echobot
Oct 6, 2020
52844ff
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 6, 2020
729fff3
botstates
Oct 6, 2020
4fc8e2d
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 7, 2020
103c7b7
Clean up paths
Oct 7, 2020
21ce792
Spellings cleanup
Oct 7, 2020
b046925
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 7, 2020
c56e1b1
Updated gitignore
Oct 7, 2020
b78d118
Typo fixed
Oct 7, 2020
de1a414
Set project ignore validation to true while opening remote skill
Oct 7, 2020
32fa411
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 8, 2020
828bee2
Merge branch 'main' into srravich/bot-projects-schema
cwhitten Oct 8, 2020
ccf5f88
Merge branch 'main' into srravich/bot-projects-schema
srinaath Oct 8, 2020
e9f525a
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 8, 2020
c791838
Merge branch 'srravich/bot-projects-schema' of https://github.com/mic…
Oct 8, 2020
5576163
Following sdk.schema approach to specificy object type using ref
Oct 8, 2020
f6076dc
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 8, 2020
1d815f1
Runtime start first pass
Oct 9, 2020
c1723b4
Runtime start updates
Oct 12, 2020
b155a49
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 14, 2020
6055397
Update to settings
Oct 14, 2020
6262995
Working bot status indicator
Oct 14, 2020
d000d76
Update to start component
Oct 15, 2020
f04a8f1
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 15, 2020
e2041ee
Stable LocalBotRuntime operations
Oct 16, 2020
bc20752
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 16, 2020
90be172
relative path support bp file
Oct 16, 2020
0a688c4
Fix schema
Oct 16, 2020
1f8a9c4
Removed workspace references.
Oct 16, 2020
6970cc5
Relative path support
Oct 16, 2020
84f0a50
Update operations on Bot project file
Oct 16, 2020
96e3fb4
Updated runtime code
Oct 19, 2020
bd580f9
Start bots panel first pass completed
Oct 19, 2020
e6ef1d2
Updated tests for removing workspace reference
Oct 20, 2020
1339b15
Removed manifest update operation
Oct 20, 2020
975952e
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 20, 2020
64cc847
Cleared logs
Oct 20, 2020
ca842f1
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 20, 2020
c4b33ff
Remove skill references
Oct 20, 2020
a4d5cb6
Remove skill references
Oct 20, 2020
3971053
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 20, 2020
a75f725
Merge branch 'srravich/3957-runtime-start' of https://github.com/micr…
Oct 20, 2020
5c28191
Update references
Oct 20, 2020
195839a
Merge branch 'srravich/bot-projects-schema' of https://github.com/mic…
Oct 20, 2020
0ba924b
Updated runtime experience
Oct 21, 2020
fa30e2a
update the recognizer types generate function
lei9444 Oct 21, 2020
9908533
Safe removal of skills
Oct 21, 2020
0b03794
Resolve bugs with $kind
Oct 22, 2020
4d50213
safely remove unused refs
Oct 22, 2020
581a9d3
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 22, 2020
034a893
Handle select skill dialog tests
Oct 22, 2020
b912855
Skill utils updated
Oct 23, 2020
ac3c86e
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 23, 2020
7bb67f3
Added more unit tests
Oct 23, 2020
6e4423e
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 23, 2020
34e64a0
Added back file to get it back to main version
Oct 23, 2020
b0f7b99
Bot status tracker operation
Oct 23, 2020
24fef2b
More tests added
Oct 24, 2020
53c6911
Moved test files
Oct 24, 2020
814a0ce
Added aria labels
Oct 24, 2020
4c0ac80
Header tests updated
Oct 25, 2020
a79dd42
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Oct 25, 2020
031175b
cleaned up tests and rebased main
Oct 25, 2020
a472ced
yarn update and header test
Oct 25, 2020
dcd0c2b
PR cleanup before moving from draft status
Oct 25, 2020
16dbd3c
Migration completed
Oct 26, 2020
1121f3c
Updated yarn.lock on vacore
Oct 26, 2020
3a8ae55
Revert azure publish yarn lock
Oct 26, 2020
c27cca1
remove fit from test
Oct 26, 2020
3d7e9fc
Update settings on removing a skill
Oct 26, 2020
68c695f
Logic update for skill deletion
Oct 26, 2020
02d935e
Merge branch 'feature/bot-projects' of https://github.com/microsoft/B…
Oct 26, 2020
4ff5427
Add get port to server
Oct 26, 2020
6d6a6c5
Start root bot if skills are not present
Oct 27, 2020
6ddb55d
feat: local bot controller
tdurnford Oct 28, 2020
ec1eb93
fet: Add test in emulator column
tdurnford Oct 28, 2020
74287da
Updated select skill dialog to disable controls if no skill
Oct 28, 2020
b7808b9
open emulator test
tdurnford Oct 28, 2020
7a70e1a
Added fnd by role
Oct 28, 2020
fc37046
Merge branch 'srravich/3957-runtime-start' of https://github.com/micr…
Oct 28, 2020
1c6724d
open Emulator test updates
Oct 29, 2020
4c6d4c5
Update to skills Utils
Oct 29, 2020
ecc013d
Support skillhost endpoint for remote skills
Oct 29, 2020
3ac0750
fix menu flash
tdurnford Oct 29, 2020
6d38c99
Port set
Oct 30, 2020
b9093b7
Merge branch 'feature/bot-projects' of https://github.com/microsoft/B…
Oct 30, 2020
cef687c
Update yarn lock
Oct 30, 2020
a907cd8
fixed styles
tdurnford Oct 30, 2020
7c12f00
tests
tdurnford Oct 30, 2020
81c72ee
tests
tdurnford Nov 2, 2020
babdd5b
Merge branch 'feature/bot-projects' of https://github.com/microsoft/B…
Nov 2, 2020
b764b63
Unit tests completed
Nov 2, 2020
7357a7d
Avoid flicker of bot menu
Nov 3, 2020
96528c0
Remove create ref
Nov 5, 2020
785642e
Rename files to remove “Local” prefix
Nov 5, 2020
6240cd0
Added pseudo element for border left
Nov 5, 2020
7ca70b1
Merge branch 'feature/bot-projects' of https://github.com/microsoft/B…
Nov 5, 2020
6179632
Renamed urls
Nov 6, 2020
d89c934
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
Nov 7, 2020
e219bab
Render design page
Nov 7, 2020
dfe64bf
Merge branch 'feature/bot-projects' of https://github.com/microsoft/B…
Nov 7, 2020
18b85a5
Revert launch.json
Nov 7, 2020
1ec88c7
More pr feedback addressed
Nov 7, 2020
1d40af0
Integration tests wrapped up
Nov 8, 2020
d78d071
Onboarding integration test updated
Nov 8, 2020
9ae22e9
Merge branch 'feature/bot-projects' into srravich/3957-runtime-start
srinaath Nov 9, 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
28 changes: 10 additions & 18 deletions Composer/cypress/integration/LuisDeploy.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,32 @@ context('Luis Deploy', () => {
cy.server();
cy.route('POST', '/api/publish/*/publish/default', { endpointURL: 'anything', status: 202 });
cy.route('POST', '/api/projects/*/settings', 'OK');
cy.route('GET', '/api/publish/*/status/default', { endpointURL: 'anything', status: 200 });
cy.route('GET', '/api/publish/*/status/default', { endpointURL: 'anything', status: 404 });
cy.visit('/home');
cy.createBot('ToDoBotWithLuisSample');
});

it('can deploy luis success', () => {
cy.findByTestId('LeftNav-CommandBarButtonUser Input').click();
cy.url().should('contain', 'language-understanding/all');
cy.findByTestId('LeftNav-CommandBarButtonDesign').click();
cy.route({
method: 'POST',
url: 'api/projects/*/build',
status: 200,
response: 'fixture:luPublish/success',
status: 400,
response: 'fixture:luPublish/failure',
});
cy.findByText(/^(Start|Restart) Bot$/).click();

// clear its settings before
cy.enterTextAndSubmit('ProjectNameInput', 'MyProject');
cy.enterTextAndSubmit('EnvironmentInput', 'composer');
cy.enterTextAndSubmit('AuthoringKeyInput', '0d4991873f334685a9686d1b48e0ff48');
// wait for the debounce interval of sync settings
cy.findByText('OK').click();
cy.findByText('Restart Bot').should('exist');
cy.findByText('Test in Emulator').should('exist');
cy.findByText(/^Start all bots/).click();
cy.findByTitle('Open start bots panel').click();
cy.findByText('See Details').click();

cy.route({
method: 'POST',
url: 'api/projects/*/build',
status: 400,
response: 'fixture:luPublish/error',
status: 200,
response: 'fixture:luPublish/success',
});
cy.findByText('Restart Bot').click();
cy.findByText('Try again').click();
cy.findByTestId('AuthoringKeyInput').type('no-id');
cy.findByText('OK').click();
cy.findByText(/^Stop all bots/).click();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import * as React from 'react';
import { fireEvent, act } from '@botframework-composer/test-utils';

import { OpenEmulatorButton } from '../../../src/components/BotRuntimeController/OpenEmulatorButton';
import { botEndpointsState, botStatusState, settingsState } from '../../../src/recoilModel';
import { BotStatus } from '../../../src/constants';
import { renderWithRecoil } from '../../testUtils';

const mockCallEmulator = jest.fn();

jest.mock('../../../src/utils/navigation', () => {
return {
openInEmulator: mockCallEmulator,
};
});

jest.mock('office-ui-fabric-react/lib/Button', () => ({
ActionButton: ({ onClick, children }) => (
<button data-testid="button" onClick={onClick}>
{children}
</button>
),
IconButton: ({ onClick, children }) => (
<button data-testid="iconButton" onClick={onClick}>
{children}
</button>
),
}));

jest.mock('office-ui-fabric-react/lib/Tooltip', () => ({
TooltipHost: ({ children }) => <div>{children}</div>,
}));

const projectId = '123.abc';

const initialState = ({ currentStatus = BotStatus.connected } = {}) => ({ set }) => {
set(botStatusState(projectId), currentStatus);
set(botEndpointsState, { [projectId]: 'http://open-in-emulator/api/messages' });
set(settingsState(projectId), {});
};

describe('<OpenEmulatorButton />', () => {
it('should show the button to open emulator', async () => {
mockCallEmulator.mockImplementationOnce((url) => {
expect(url).toBeDefined();
});
const { findByTestId } = renderWithRecoil(<OpenEmulatorButton projectId={projectId} />, initialState());
const button = await findByTestId('button');
act(() => {
fireEvent.click(button);
});
});

it('should not show the button if the status is not `BotStatus.connected`', () => {
const { container } = renderWithRecoil(
<OpenEmulatorButton projectId={projectId} />,
initialState({ currentStatus: BotStatus.pending })
);
expect(container).not.toHaveTextContent('Test in Emulator');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import * as React from 'react';
import { render, fireEvent, getByText } from '@botframework-composer/test-utils';

import { ErrorCallout } from '../../../src/components/TestController/errorCallout';
import { ErrorCallout } from '../../../src/components/BotRuntimeController/errorCallout';

describe('<ErrorCallout />', () => {
it('should render the <ErrorCallout />', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import * as React from 'react';
import { render, fireEvent } from '@botframework-composer/test-utils';

import { ErrorInfo } from '../../../src/components/TestController/errorInfo';
import { ErrorInfo } from '../../../src/components/BotRuntimeController/errorInfo';

describe('<ErrorInfo />', () => {
it('should render <ErrorInfo />', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import * as React from 'react';
import { render } from '@botframework-composer/test-utils';

import { Loading } from '../../../src/components/TestController/loading';
import { Loading } from '../../../src/components/BotRuntimeController/loading';
import { BotStatus } from '../../../src/constants';

describe('<Loading />', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from 'react';
import { fireEvent } from '@botframework-composer/test-utils';

import { PublishDialog } from '../../../src/components/TestController/publishDialog';
import { PublishDialog } from '../../../src/components/BotRuntimeController/publishDialog';
import { botDisplayNameState, settingsState, dispatcherState, currentProjectIdState } from '../../../src/recoilModel';
import { renderWithRecoil } from '../../testUtils';
jest.useFakeTimers();
Expand Down

This file was deleted.

26 changes: 25 additions & 1 deletion Composer/packages/client/__tests__/components/header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,35 @@ import * as React from 'react';

import { renderWithRecoil } from '../testUtils';
import { Header } from '../../src/components/Header';
import { currentModeState } from '../../src/recoilModel';

describe('<Header />', () => {
it('should render the header', () => {
const { container } = renderWithRecoil(<Header />);

expect(container).toHaveTextContent('Bot Framework Composer');
});

it('should not show the start bots widget in Home page', async () => {
const initRecoilState = ({ set }) => {
set(currentModeState, 'home');
};
const { queryByText } = renderWithRecoil(<Header />, initRecoilState);
expect(queryByText('Start all bots')).toBeNull();
});

it('should show the start bots widget on design page', async () => {
const initRecoilState = ({ set }) => {
set(currentModeState, 'design');
};
const result = renderWithRecoil(<Header />, initRecoilState);
expect(result.queryByText('Start all bots')).not.toBeNull();
});

it('should show the start bots widget on settings page', async () => {
const initRecoilState = ({ set }) => {
set(currentModeState, 'settings');
};
const result = renderWithRecoil(<Header />, initRecoilState);
expect(result.queryByText('Start all bots')).not.toBeNull();
});
});
Loading