Skip to content

Commit

Permalink
Separate Autoscaler E2E tests as a new job in Travis (#4074)
Browse files Browse the repository at this point in the history
* e2e tweaks

* Separate out Autoscaler E2E tests
  • Loading branch information
nwmac authored Jan 3, 2020
1 parent d9e7fc5 commit fd5fbc7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ jobs:
- "./deploy/ci/travis/job-e2e-before_script.sh true"
script:
- "./deploy/ci/travis/job-e2e-script.sh core"
- name: E2E Tests - Autoscaler
before_script:
- "./deploy/ci/travis/job-e2e-before_script.sh"
script:
- "./deploy/ci/travis/job-e2e-script.sh autoscaler"
- name: E2E Tests - All Other Suite
before_script:
- "./deploy/ci/travis/job-e2e-before_script.sh"
Expand Down
9 changes: 9 additions & 0 deletions protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,16 @@ const coreSuite = globby.sync([
'./src/test-e2e/metrics/metrics-registration-e2e.spec.ts',
])

const autoscalerSuite = globby.sync([
'./src/test-e2e/application/application-autoscaler-e2e.spec.ts',
])

const fullMinusOtherSuites = globby.sync([
...fullSuite,
...longSuite.map(file => '!' + file),
...manageUsersSuite.map(file => '!' + file),
...coreSuite.map(file => '!' + file),
...autoscalerSuite.map(file => '!' + file),
])

const config = {
Expand All @@ -131,6 +136,10 @@ const config = {
...coreSuite,
...excludeTests
]),
autoscaler: globby.sync([
...autoscalerSuite,
...excludeTests
]),
fullMinusOtherSuites: globby.sync([
...fullMinusOtherSuites,
...excludeTests
Expand Down
2 changes: 2 additions & 0 deletions src/test-e2e/endpoints/endpoints-connect-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { MenuComponent } from '../po/menu.po';
import { SnackBarPo } from '../po/snackbar.po';
import { ConnectDialogComponent } from './connect-dialog.po';
import { EndpointMetadata, EndpointsPage } from './endpoints.po';
import { SideNavMenuItem } from '../po/side-nav.po';

describe('Endpoints', () => {
const endpointsPage = new EndpointsPage();
Expand Down Expand Up @@ -92,6 +93,7 @@ describe('Endpoints', () => {

// NOTE: We connected as the User not the Admin, so logging in as admin will NOT have the endpoint connected
it('should go directly to endpoints view on logout and login (as admin)', () => {
endpointsPage.sideNav.goto(SideNavMenuItem.Endpoints);
endpointsPage.header.logout();
const loginPage = new LoginPage();
loginPage.waitForLogin();
Expand Down

0 comments on commit fd5fbc7

Please sign in to comment.