diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b16b04a5a..9b4062cb1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,6 @@ jobs: run: npm run build-lib - name: Run knora stack run: make knora-stack - - run: npm run webdriver-update - name: Run e2e tests run: npm run e2e env: diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts index b84510cf4..94927658f 100644 --- a/e2e/src/app.e2e-spec.ts +++ b/e2e/src/app.e2e-spec.ts @@ -88,9 +88,7 @@ describe('Test App', () => { const loader = ProtractorHarnessEnvironment.loader(); - const submitButton = await page.getAdvancedSearchSubmitButton(loader); - - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectOntos = await page.getAdvancedSearchOntologySelection(loader, timeout); @@ -121,7 +119,7 @@ describe('Test App', () => { await resClasses.clickOptions({ text: 'Thing'}); - expect(await submitButton.isDisabled()).toBe(false); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(false); // browser.sleep(200000); @@ -134,9 +132,7 @@ describe('Test App', () => { const loader = ProtractorHarnessEnvironment.loader(); - const submitButton = await page.getAdvancedSearchSubmitButton(loader); - - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectOntos = await page.getAdvancedSearchOntologySelection(loader, timeout); @@ -146,13 +142,13 @@ describe('Test App', () => { await browser.wait(EC.presenceOf(element(by.css('.select-resource-class'))), timeout, 'Wait for resource class options to be visible.'); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const addPropButton = await page.getAdvancedSearchPropertyAddButton(loader); await addPropButton.click(); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectProps = await page.getAdvancedSearchPropertySelection(loader); @@ -160,19 +156,19 @@ describe('Test App', () => { await selectProps.clickOptions({text: 'Integer'}); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectCompOps = await page.getAdvancedSearchComparisonOperatorSelection(loader); await selectCompOps.clickOptions({ text: 'is equal to'}); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const input = await loader.getHarness(MatInputHarness); await input.setValue('1'); - expect(await submitButton.isDisabled()).toBe(false); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(false); // browser.sleep(200000); }); @@ -184,9 +180,7 @@ describe('Test App', () => { const loader = ProtractorHarnessEnvironment.loader(); - const submitButton = await page.getAdvancedSearchSubmitButton(loader); - - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectOntos = await page.getAdvancedSearchOntologySelection(loader, timeout); @@ -196,13 +190,13 @@ describe('Test App', () => { await browser.wait(EC.presenceOf(element(by.css('.select-resource-class'))), timeout, 'Wait for resource class options to be visible.'); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const addPropButton = await page.getAdvancedSearchPropertyAddButton(loader); await addPropButton.click(); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectProps = await page.getAdvancedSearchPropertySelection(loader); @@ -210,13 +204,13 @@ describe('Test App', () => { await selectProps.clickOptions({text: 'Another thing'}); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const selectCompOps = await page.getAdvancedSearchComparisonOperatorSelection(loader); await selectCompOps.clickOptions({ text: 'is equal to'}); - expect(await submitButton.isDisabled()).toBe(true); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(true); const input = await loader.getHarness(MatInputHarness); @@ -236,7 +230,7 @@ describe('Test App', () => { await options[0].click(); - expect(await submitButton.isDisabled()).toBe(false); + expect(await (await page.getAdvancedSearchSubmitButton(loader)).isDisabled()).toBe(false); // browser.sleep(200000); }); diff --git a/package.json b/package.json index 0ba9c7f45..ac8cd72db 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,7 @@ "yalc-publish-lib": "npm run build-lib && yalc publish dist/@dasch-swiss/dsp-ui", "build-app": "ng b --prod", "lint": "ng lint", - "e2e": "ng e2e --prod=true --protractor-config=./e2e/protractor.conf.js --webdriver-update=false", - "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.37" + "e2e": "ng e2e --prod=true --protractor-config=./e2e/protractor.conf.js --webdriver-update" }, "private": true, "dependencies": { diff --git a/projects/dsp-ui/src/lib/search/advanced-search/advanced-search.component.html b/projects/dsp-ui/src/lib/search/advanced-search/advanced-search.component.html index 45065fa48..884ab26b4 100644 --- a/projects/dsp-ui/src/lib/search/advanced-search/advanced-search.component.html +++ b/projects/dsp-ui/src/lib/search/advanced-search/advanced-search.component.html @@ -2,41 +2,14 @@