diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83d5bc6..525541b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: # Needed for nx-set-shas within nx-cloud-main.yml, when run on the master branch @@ -16,16 +16,17 @@ jobs: name: Nx Cloud - Main Job uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.1 with: - main-branch-name: master + main-branch-name: main number-of-agents: 3 init-commands: | npx nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3 parallel-commands: | npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=3 + npx nx affected --target=lint --parallel=3 --ci npx nx affected --target=test --parallel=3 --ci --code-coverage - npx nx affected --target=build --parallel=3 + npx nx affected --target=build --parallel=3 --ci + npx nx affected --target=e2e --parallel=3 --ci --code-coverage agents: name: Nx Cloud - Agents diff --git a/apps/usersrole-nx-e2e/project.json b/apps/usersrole-nx-e2e/project.json index d0af2a8..68ac76b 100644 --- a/apps/usersrole-nx-e2e/project.json +++ b/apps/usersrole-nx-e2e/project.json @@ -9,7 +9,8 @@ "options": { "cypressConfig": "apps/usersrole-nx-e2e/cypress.config.ts", "devServerTarget": "usersrole-nx:serve:development", - "testingType": "e2e" + "testingType": "e2e", + "port": 4204 }, "configurations": { "production": { diff --git a/apps/usersrole-nx-e2e/src/e2e/app.cy.ts b/apps/usersrole-nx-e2e/src/e2e/app.cy.ts index f509671..68e42fd 100644 --- a/apps/usersrole-nx-e2e/src/e2e/app.cy.ts +++ b/apps/usersrole-nx-e2e/src/e2e/app.cy.ts @@ -1,13 +1,7 @@ -import { getGreeting } from '../support/app.po'; - describe('usersrole-nx', () => { beforeEach(() => cy.visit('/')); - it('should display welcome message', () => { - // Custom command example, see `../support/commands.ts` file - cy.login('my-email@something.com', 'myPassword'); - - // Function helper example, see `../support/app.po.ts` file - getGreeting().contains('Welcome usersrole-nx'); + it('should be running', () => { + cy.url().should('contain', ''); }); }); diff --git a/apps/usersrole-nx/src/app/app.component.spec.ts b/apps/usersrole-nx/src/app/app.component.spec.ts index 8697efa..caa7da0 100644 --- a/apps/usersrole-nx/src/app/app.component.spec.ts +++ b/apps/usersrole-nx/src/app/app.component.spec.ts @@ -9,15 +9,6 @@ describe('AppComponent', () => { }).compileComponents(); }); - it('should render title', () => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('h1')?.textContent).toContain( - 'Welcome usersrole-nx' - ); - }); - it(`should have as title 'usersrole-nx'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance;