From 02c76968ec0eca025e8f094fee44b1ecb0192964 Mon Sep 17 00:00:00 2001 From: R Boelter Date: Fri, 22 Jan 2021 15:57:43 +0100 Subject: [PATCH] test fixes --- .github/workflows/openid_plugin_test.yml | 10 +++++----- cypress/tests/functional/OpenID.spec.js | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/openid_plugin_test.yml b/.github/workflows/openid_plugin_test.yml index 60f8a6d..52139eb 100644 --- a/.github/workflows/openid_plugin_test.yml +++ b/.github/workflows/openid_plugin_test.yml @@ -49,11 +49,11 @@ jobs: CYPRESS_DBPASSWORD: ojs-ci CYPRESS_DBHOST: 127.0.0.1 CYPRESS_FILESDIR: files - CYPRESS_OPENID_CUSTOM_ID: ${{ secrets.CYPRESS_OPENID_CUSTOM_ID }} - CYPRESS_OPENID_CUSTOM_IMG: ${{ secrets.CYPRESS_OPENID_CUSTOM_IMG }} - CYPRESS_OPENID_CUSTOM_SECRET: ${{ secrets.CYPRESS_OPENID_CUSTOM_SECRET }} - CYPRESS_OPENID_CUSTOM_TXT: ${{ secrets.CYPRESS_OPENID_CUSTOM_TXT }} - CYPRESS_OPENID_CUSTOM_URL: ${{ secrets.CYPRESS_OPENID_CUSTOM_URL }} + CYPRESS_OPENIDID: ${{ secrets.CYPRESS_OPENID_CUSTOM_ID }} + CYPRESS_OPENIDIMG: ${{ secrets.CYPRESS_OPENID_CUSTOM_IMG }} + CYPRESS_OPENIDSECRET: ${{ secrets.CYPRESS_OPENID_CUSTOM_SECRET }} + CYPRESS_OPENIDTXT: ${{ secrets.CYPRESS_OPENID_CUSTOM_TXT }} + CYPRESS_OPENIDURL: ${{ secrets.CYPRESS_OPENID_CUSTOM_URL }} steps: - name: Setup PHP, extensions and composer uses: shivammathur/setup-php@v2 diff --git a/cypress/tests/functional/OpenID.spec.js b/cypress/tests/functional/OpenID.spec.js index fbf735b..c04d0d3 100644 --- a/cypress/tests/functional/OpenID.spec.js +++ b/cypress/tests/functional/OpenID.spec.js @@ -31,11 +31,11 @@ describe('OpenID plugin tests', function () { // Fill out settings form cy.get('form[id="openIDSettings"] input[name="provider[custom][active]"]').check({force: true}); cy.waitJQuery(); - cy.get('form[id="openIDSettings"] input[name="provider[custom][configUrl]"]').clear().type(Cypress.env("OPENID_CUSTOM_URL")); - cy.get('form[id="openIDSettings"] input[name="provider[custom][btnImg]"]').clear().type(Cypress.env("OPENID_CUSTOM_IMG")); - cy.get('form[id="openIDSettings"] input[name="provider[custom][btnTxt][en_US]"]').clear().type(Cypress.env("OPENID_CUSTOM_TXT")); - cy.get('form[id="openIDSettings"] input[name="provider[custom][clientId]"]').clear().type(Cypress.env("OPENID_CUSTOM_ID")); - cy.get('form[id="openIDSettings"] input[name="provider[custom][clientSecret]"]').clear().type(Cypress.env("OPENID_CUSTOM_SECRET")); + cy.get('form[id="openIDSettings"] input[name="provider[custom][configUrl]"]').clear().type(Cypress.env("OPENIDURL")); + cy.get('form[id="openIDSettings"] input[name="provider[custom][btnImg]"]').clear().type(Cypress.env("OPENIDIMG")); + cy.get('form[id="openIDSettings"] input[name="provider[custom][btnTxt][en_US]"]').clear().type(Cypress.env("OPENIDTXT")); + cy.get('form[id="openIDSettings"] input[name="provider[custom][clientId]"]').clear().type(Cypress.env("OPENIDID")); + cy.get('form[id="openIDSettings"] input[name="provider[custom][clientSecret]"]').clear().type(Cypress.env("OOPENIDSECRET")); cy.get('form[id="openIDSettings"] input[name="legacyLogin"]').check({force: true}); cy.get('form[id="openIDSettings"] div[id="generateSecret"]').click(); cy.get('form[id="openIDSettings"] input[name="generateAPIKey"]').check({force: true}); @@ -49,6 +49,6 @@ describe('OpenID plugin tests', function () { it('Check OpenID Authentication Plugin Login Page', function () { cy.visit('/index.php/publicknowledge/login'); - cy.get('a[id="openid-provider-custom"]').contains(Cypress.env("OPENID_CUSTOM_TXT")); + cy.get('a[id="openid-provider-custom"]').contains(Cypress.env("OPENIDTXT")); }); });