Skip to content
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.

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

E2E: Basic list component tests using organisation spaces tab #2835

Merged
merged 30 commits into from
Aug 31, 2018
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b258550
Initial test
richard-cox Aug 9, 2018
b78ed25
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 10, 2018
804a0b2
WIP
richard-cox Aug 10, 2018
6160f9c
WIP
richard-cox Aug 13, 2018
91fb0f1
Add test for 'no entities' list
richard-cox Aug 14, 2018
8c4061e
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 14, 2018
4f11240
Remove fdescribe
richard-cox Aug 14, 2018
a495a58
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 15, 2018
0d98917
Missed file + another travis typescript wonderfail
richard-cox Aug 15, 2018
30a2106
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 16, 2018
3d73a0a
Fixes following merge
richard-cox Aug 16, 2018
24b5985
Improve time taken to execute tests, increase timeout
richard-cox Aug 16, 2018
0535e74
Missed file...
richard-cox Aug 16, 2018
0422471
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 16, 2018
7ab69a0
Merge branch 'e2e-fix-and-clear-token-on-unregister' into e2e-lists
richard-cox Aug 17, 2018
e492cbb
Fix build
richard-cox Aug 17, 2018
9a98e46
Increase max time
richard-cox Aug 20, 2018
5f173fe
Ensure we wait for the delete org to complete before moving on
richard-cox Aug 20, 2018
25eb8ea
Merge remote-tracking branch 'origin/v2-master' into e2e-lists
richard-cox Aug 21, 2018
200199f
Merge remote-tracking branch 'origin/v2-master' into e2e-lists
richard-cox Aug 24, 2018
a0ca708
Merge remote-tracking branch 'origin/v2-master' into e2e-lists
richard-cox Aug 28, 2018
4f80711
Increase mem for standard `build`
richard-cox Aug 28, 2018
1aeb5cc
Merge remote-tracking branch 'origin/v2-master' into e2e-lists
richard-cox Aug 29, 2018
ad7e548
Updates following review
richard-cox Aug 29, 2018
45945a5
Fix jetstream output
richard-cox Aug 30, 2018
c642107
Add additional logging
richard-cox Aug 30, 2018
22a6d64
Temporarily disable app deploy test - see #2930
richard-cox Aug 30, 2018
ad739ae
Fix application deploy
richard-cox Aug 30, 2018
ce2d2b5
Merge branch 'fix-app-deply' into e2e-lists
richard-cox Aug 30, 2018
cb28ee1
Enable app deply e2e test
richard-cox Aug 30, 2018
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
Prev Previous commit
Next Next commit
Add additional logging
  • Loading branch information
richard-cox committed Aug 30, 2018
commit c6421073f22758240fdd395307cce30a6fab4dde
16 changes: 15 additions & 1 deletion src/test-e2e/application/application-deploy-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,23 @@ describe('Application Deploy', function () {
beforeEach(() => nav.goto(SideNavMenuItem.Applications));

it('Should deploy app from GitHub', () => {
const loggingPrefix = 'Application Deploy: Deploy from Github:';
expect(appWall.isActivePage()).toBeTruthy();

// Should be on deploy app modal
const deployApp = appWall.clickDeployApp();
expect(deployApp.header.getTitleText()).toBe('Deploy');

// Check the steps
e2e.log(`${loggingPrefix} Checking Steps`);
deployApp.stepper.getStepNames().then(steps => {
expect(steps.length).toBe(4);
expect(steps[0]).toBe('Cloud Foundry');
expect(steps[1]).toBe('Source');
expect(steps[2]).toBe('Source Config');
expect(steps[3]).toBe('Deploy');
});
e2e.log(`${loggingPrefix} Cf/Org/Space Step`);
expect(deployApp.stepper.getActiveStepName()).toBe('Cloud Foundry');
promise.all([
deployApp.stepper.getStepperForm().getText('cf'),
Expand All @@ -80,12 +83,15 @@ describe('Application Deploy', function () {
expect(deployApp.stepper.canNext()).toBeTruthy();
deployApp.stepper.next();

e2e.log(`${loggingPrefix} Source Step`);
expect(deployApp.stepper.getActiveStepName()).toBe('Source');
expect(deployApp.stepper.canNext()).toBeFalsy();
deployApp.stepper.getStepperForm().fill({ 'projectname': testApp });

deployApp.stepper.waitUntilCanNext('Next');
deployApp.stepper.next();

e2e.log(`${loggingPrefix} Source Config Step`);
expect(deployApp.stepper.getActiveStepName()).toBe('Source Config');

const commits = deployApp.getCommitList();
Expand All @@ -100,27 +106,35 @@ describe('Application Deploy', function () {
commits.selectRow(0);
expect(deployApp.stepper.canNext()).toBeTruthy();

e2e.log(`${loggingPrefix} Select a commit (selected)`);

// Turn off waiting for Angular - the web socket connection is kept open which means the tests will timeout
// waiting for angular if we don't turn off.
browser.waitForAngularEnabled(false);

// Press next to deploy the app
deployApp.stepper.next();

e2e.log(`${loggingPrefix} Deploying Step (wait)`);
// Wait until app summary button can be pressed
deployApp.stepper.waitUntilCanNext('Go to App Summary');

e2e.log(`${loggingPrefix} Deploying Step (after wait)`);
// Click next
deployApp.stepper.next();

e2e.log(`${loggingPrefix} Waiting For Application Summary Page`);
// Should be app summary
browser.wait(ApplicationSummary.detect()
.then(appSummary => {
appSummary.waitForPage();
appSummary.header.waitForTitleText(appName);
return appSummary.cfGuid;
})
.then(cfGuid => applicationE2eHelper.deleteApplication(null, { appName })));
.then(cfGuid => {
e2e.log(`${loggingPrefix} Starting application delete`);
return applicationE2eHelper.deleteApplication(null, { appName });
}));
});

});
Expand Down