From 15355b378406e30a0bdfc425f11f072fd417f17c Mon Sep 17 00:00:00 2001 From: Vlad Ioffe Date: Sat, 9 Dec 2023 21:31:04 +0200 Subject: [PATCH] playwrite 10 --- .github/workflows/test.yaml | 4 ++-- package.json | 4 +--- protractor.conf.js | 44 ------------------------------------- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 protractor.conf.js diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6a87dce5..8c67a025 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,8 +34,8 @@ jobs: - name: run unit tests run: npm run test:ci - - name: run tests - run: npm run e2e:quick + - name: run e2e tests + run: npm run e2e - name: run build test run: npm run build:demo diff --git a/package.json b/package.json index 4e3f21ba..3cc7008e 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,8 @@ "test:ci:lib": "ng test ng2-date-picker --watch=true --browsers=ChromeHeadless", "lint": "ng lint", "lint:fix": "ng lint --fix", - "e2e": "ng e2e --port 3200", - "e2e:quick": "playwright test", + "e2e": "playwright test", "e2e:ui": "playwright test --ui", - "e2e:headless": "HEADLESS=true ng e2e", "build:index": "node build.js", "build:demo": "rm -rf dist/ && ng build ng2-date-picker-demo --configuration production && npm run build:index", "release": "npm run build:lib && cd dist/ng2-date-picker && npm publish", diff --git a/protractor.conf.js b/protractor.conf.js deleted file mode 100644 index 3fa4799b..00000000 --- a/protractor.conf.js +++ /dev/null @@ -1,44 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const {SpecReporter} = require('jasmine-spec-reporter'); - -const headless = process.env.HEADLESS === 'true'; - -exports.config = { - allScriptsTimeout: 120000, - specs: [ - './e2e/**/*spec.ts' - ], - capabilities: { - browserName: 'chrome', - shardTestFiles: headless, - maxInstances: headless ? 10 : 1, - chromeOptions: { - args: headless ? [ - '--no-sandbox', - '--headless', - '--disable-gpu', - '--window-size=1280,1024'] : - [ - '--no-sandbox' - ] - } - }, - chromeOnly:true, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 120000, - print: function () { - } - }, - onPrepare() { - jasmine.getEnv().addReporter( - new SpecReporter({spec: {displayStacktrace: 'pretty'}})); - - require('ts-node').register({project: 'e2e/tsconfig.e2e.json'}); - } -};