Merge branch 'port-to-3_5-895' into 'main'

Adapts to OJS 3.5.0

See merge request softwares-pkp/plugins_ojs/notificacao-atualizacao-plugins!3

Author: CarlosVercosaLepidus

.github/workflows/generate-package.yml

@@ -7,53 +7,8 @@ name: Create release and tar.gz package for it
 
 jobs:
   create-release:
-    name: Create release and package
-    env:
-      PLUGIN_NAME: pluginUpdateNotification
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Check version.xml
-        run: |
-          sudo apt install xmlstarlet
-          application=$(xmlstarlet sel -t -v 'version/application' version.xml)
-          if [ $application != $PLUGIN_NAME ]; then exit 1; fi
-          release=$(xmlstarlet sel -t -v 'version/release' version.xml)
-          tag=${{ github.ref }}
-          tag=${tag/refs\/tags\/v}
-          if [[ $release != $tag* ]]; then exit 1; fi
-          date_version=$(xmlstarlet sel -t -v 'version/date' version.xml)
-          current_date=$(date +'%Y-%m-%d')
-          if [ $date_version != $current_date ]; then exit 1; fi
-        shell: bash
-      - name: Create the tar.gz package
-        run: |
-          mkdir $PLUGIN_NAME
-          ls -la
-          shopt -s extglob
-          cp -r !($PLUGIN_NAME|.git*|tests|.|..) $PLUGIN_NAME
-          ls -la
-          tar -zcvf $PLUGIN_NAME.tar.gz $PLUGIN_NAME
-          ls -la
-        shell: bash
-      - name: Create the release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false
-      - name: Upload the package as release asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.PLUGIN_NAME }}.tar.gz
-          asset_name: ${{ env.PLUGIN_NAME }}.tar.gz
-          asset_content_type: application/x-compressed-tar
+    uses: lepidus/github-workflows/.github/workflows/generate-package.yml@main
+    with:
+      plugin_name: pluginUpdateNotification
+    permissions:
+      contents: write

.gitlab-ci.yml

@@ -3,6 +3,21 @@ variables:
 
 include:
   - project: 'documentacao-e-tarefas/modelosparaintegracaocontinua'
-    ref: main
+    ref: stable-3_5_0
     file:
-      - 'templates/groups/pkp_plugin.yml'
+      - 'templates/groups/pkp_plugin.yml'
+      - 'templates/groups/ojs/cypress_tests.yml'
+      - 'templates/groups/ops/cypress_tests.yml'
+      - 'templates/groups/omp/cypress_tests.yml'
+
+ojs_integration_tests:
+  rules:
+    - when: never
+
+ops_integration_tests:
+  rules:
+    - when: never
+
+omp_integration_tests:
+  rules:
+    - when: never

PluginUpdateNotificationPlugin.php

@@ -17,10 +17,10 @@
 
 use PKP\plugins\Hook;
 use PKP\plugins\GenericPlugin;
+use PKP\plugins\GalleryPlugin;
 use PKP\config\Config;
 use PKP\db\DAORegistry;
 use APP\core\Application;
-use APP\plugins\generic\pluginUpdateNotification\classes\PluginUpdateNotification;
 
 class PluginUpdateNotificationPlugin extends GenericPlugin
 {
@@ -61,6 +61,8 @@ public function websiteSettingsCallback($hookName, $params)
             ]);
             $output .= sprintf('%s', $smarty->fetch($this->getTemplateResource('updateNotificationPlugins.tpl')));
         }
+
+        return false;
     }
 
     private function getUpgradablePlugins()
@@ -70,7 +72,7 @@ private function getUpgradablePlugins()
         $updatePluginsNames = array();
 
         foreach ($pluginsGallery as $plugin) {
-            if ($plugin->getCurrentStatus() == PLUGIN_GALLERY_STATE_UPGRADABLE) {
+            if ($plugin->getCurrentStatus() == GalleryPlugin::PLUGIN_GALLERY_STATE_UPGRADABLE) {
                 $updatePluginsNames[] = $plugin->getLocalizedName();
             }
         }

README.md

@@ -5,6 +5,7 @@ This plugin generates a notification in `Settings`>` Website` informing all the
 ## Compatibility
 
 This plugin is compatible with **OJS**, **OPS** and **OMP** in the following versions:
+* 3.5.0
 * 3.4.0
 * 3.3.0
 * 3.2.1

cypress/support/commands.js

@@ -16,9 +16,9 @@ Cypress.Commands.add('loginAdmin', () => {
 
 Cypress.Commands.add('goToWebsiteSettings', () => {
 	cy.loginAdmin();
-	cy.get('.app__nav a')
+	cy.get('nav')
 		.contains('Website')
-		.click();
+		.click( {force: true});
 });
 
 Cypress.Commands.add('goToPluginSettings', () => {

cypress/testData/doiInSummary.tar.gz

@@ -13,13 +13,13 @@ describe('Setup scenario', function () {
 		});
 	});
 
-	it('install plugin doiInSummary version 1.3.1 ', function () {
-		const fileName = 'plugins/generic/pluginUpdateNotification/cypress/testData/doiInSummary.tar.gz';
+	it('install plugin shariff version 3.5.1.0 ', function () {
+		const fileName = 'plugins/generic/pluginUpdateNotification/cypress/testData/shariff-3_5_0.tar.gz';
 		cy.goToPluginSettings();
 		cy.get('.pkp_linkaction_upload').contains('Upload A New Plugin').click();
 		cy.get('#plupload-pkpUploaderDropZone').selectFile(fileName, { action: 'drag-drop' });
-		cy.get('.pkp_uploader_details').contains('doiInSummary.tar.gz');
+		cy.get('.pkp_uploader_details').contains('shariff-3_5_0.tar.gz');
 		cy.get('.submitFormButton').contains('Save').click();
-		cy.get('div').contains('Successfully installed version 1.3.1.0');
+		cy.get('div').contains('Successfully installed version 3.5.1.0');
 	});
 });

cypress/testData/shariff-3_5_0.tar.gz

@@ -1,8 +1,8 @@
 import '../support/commands';
 
 describe('Validate PluginUpdateNotification plugin works', function () {
-	it('shows a notification informing doiInSummary plugin can be updgraded', function () {
+	it('Shows a notification informing shariff plugin can be updgraded', function () {
 		cy.goToWebsiteSettings();
-		cy.get('.pkp_notification').get('.notifyWarning').contains('The following plugins have updates available: DOI in Summary');
+		cy.get('#pluginUpdateNotification').contains('The following plugins have updates available: Shariff');
 	});
 });

cypress/tests/Test1_setupScenario.cy.js

@@ -1,13 +1,16 @@
 import '../support/commands';
 
 describe('Tear down scenario', function () {
-	it ('uninstalls the doiInSummary plugin', function () {
+	it ('Uninstalls the Shariff plugin', function () {
 		cy.goToPluginSettings();
-        cy.get('#component-grid-settings-plugins-settingsplugingrid-category-generic-row-doiinsummaryplugin > .first_column > .show_extras').click();
+        cy.get('#component-grid-settings-plugins-settingsplugingrid-category-generic-row-shariffplugin > .first_column > .show_extras').click();
         cy.get(
-			'#component-grid-settings-plugins-settingsplugingrid-category-generic-row-doiinsummaryplugin-control-row'
+			'#component-grid-settings-plugins-settingsplugingrid-category-generic-row-shariffplugin-control-row'
 		).contains('Delete').click();
-        cy.get('.ok').click();
+        cy.get('.pkpButton').contains('OK').click();
         cy.get('div').should('include.text', ' successfuly deleted');
+		cy.reload();
+		cy.contains('The following plugins have updates available: Shariff')
+			.should('not.exist');
 	});
 });