From 68e024d9a43ed2e8a27c6bab644d3c9d22c8fe15 Mon Sep 17 00:00:00 2001 From: R Boelter Date: Fri, 22 Jan 2021 16:12:47 +0100 Subject: [PATCH] update README.md and minor fixes --- .github/workflows/openid_plugin_test.yml | 10 +++++----- README.md | 6 ++++-- cypress/tests/functional/OpenID.spec.js | 16 ++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/openid_plugin_test.yml b/.github/workflows/openid_plugin_test.yml index 52139eb..60f8a6d 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_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 }} + 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 }} steps: - name: Setup PHP, extensions and composer uses: shivammathur/setup-php@v2 diff --git a/README.md b/README.md index cd47e1a..c9acf51 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # OJS Plugin for OpenID integration -[![Build Status](https://travis-ci.org/leibniz-psychology/pkp-openid.svg?branch=master)](https://travis-ci.org/leibniz-psychology/pkp-openid) + +![CI Test](https://github.com/leibniz-psychology/pkp-openid/workflows/CI%20Test/badge.svg?branch=master) + ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/leibniz-psychology/pkp-openid?include_prereleases&label=latest%20release) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/leibniz-psychology/pkp-openid) ![GitHub](https://img.shields.io/github/license/leibniz-psychology/pkp-openid) -[![OJS-Version](https://img.shields.io/badge/pkp--ojs-3.2.1-brightgreen)](https://github.com/pkp/ojs/tree/stable-3_2_1) +[![OJS-Version](https://img.shields.io/badge/pkp--ojs-3.3-brightgreen)](https://github.com/pkp/ojs/tree/master) ![GitHub All Releases](https://img.shields.io/github/downloads/leibniz-psychology/pkp-openid/total) ## Description: diff --git a/cypress/tests/functional/OpenID.spec.js b/cypress/tests/functional/OpenID.spec.js index c04d0d3..b115b70 100644 --- a/cypress/tests/functional/OpenID.spec.js +++ b/cypress/tests/functional/OpenID.spec.js @@ -17,8 +17,8 @@ describe('OpenID plugin tests', function () { }); it('Enable OpenID Authentication Plugin', function () { -/* cy.server(); - cy.route('POST', Cypress.env("baseUrl") + '/index.php/' + Cypress.env("context") + '/$$$call$$$/grid/settings/plugins/settings-plugin-grid/manage?category=generic&plugin=openidplugin&verb=settings&save=1').as('saveSettings');*/ + /* cy.server(); + cy.route('POST', Cypress.env("baseUrl") + '/index.php/' + Cypress.env("context") + '/$$$call$$$/grid/settings/plugins/settings-plugin-grid/manage?category=generic&plugin=openidplugin&verb=settings&save=1').as('saveSettings');*/ cy.login('admin', 'admin', 'publicknowledge'); cy.get('nav[class="app__nav"] a:contains("Website")').click(); cy.get('button[id="plugins-button"]').click(); @@ -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("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="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="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("OPENIDTXT")); + cy.get('a[id="openid-provider-custom"]').contains(Cypress.env("OPENID_CUSTOM_TXT")); }); });