Merge 0ba18b0 into e267658

.github/actions/update-webdriver/action.yml

@@ -4,9 +4,6 @@ runs:
   steps:
     - name: Install Webdriver version
       run: |
-        export CHROME_BIN=`pwd`/chrome/google-chrome
-        export CHROME_VERSION=$($CHROME_BIN --version | awk '{ print $3 }' | cut -d'.' -f 1,2,3)
-        export DRIVER_VERSION=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_VERSION}")
-        echo "using chrome driver version $DRIVER_VERSION"
-        ./node_modules/.bin/webdriver-manager update --gecko=false --versions.chrome=${DRIVER_VERSION}
-      shell: bash
+        ./node_modules/.bin/webdriver-manager update --gecko=false
+        ./node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update --gecko=false
+      shell: bash

DEVELOPMENT.md

@@ -77,3 +77,11 @@ Run all tests locally:
 Filter tests to run (by the content of the describe/it phrase of the tests):
 
 `grunt karma:debug --grep=contains-this`
+
+Running in docker container
+---------------------------
+
+`docker run -d -p 8080:80 --name cometvisu-test -v "$PWD/compiled/source":/var/www/html php:8.0-apache`
+
+Test with PHP 5.2 (Wiregate version)
+`docker run -d -p 8080:80 --name cometvisu-test -v "$PWD/compiled/source":/var/www/html deminy/php-5.2`

Gruntfile.js

@@ -212,51 +212,6 @@ module.exports = function(grunt) {
     branch = grunt.option('branch');
 
   var config = {
-
-    // license header adding
-    usebanner: {
-      dist: {
-        options: {
-          position: 'top',
-          replace: true,
-          linebreak: true,
-          process: function( filepath ) {
-            var filename = filepath.match(/\/([^/]*)$/)[1];
-            if (filename === "__init__.js") { return ""; }
-
-            return grunt.template.process('/* <%= filename %> \n'+
-              ' * \n'+
-              ' * copyright (c) 2010-<%= grunt.template.today("yyyy") %>, Christian Mayer and the CometVisu contributors.\n'+
-              ' * \n'+
-              ' * This program is free software; you can redistribute it and/or modify it\n'+
-              ' * under the terms of the GNU General Public License as published by the Free\n'+
-              ' * Software Foundation; either version 3 of the License, or (at your option)\n'+
-              ' * any later version.\n'+
-              ' *\n'+
-              ' * This program is distributed in the hope that it will be useful, but WITHOUT\n'+
-              ' * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n'+
-              ' * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n'+
-              ' * more details.\n'+
-              ' *\n'+
-              ' * You should have received a copy of the GNU General Public License along\n'+
-              ' * with this program; if not, write to the Free Software Foundation, Inc.,\n'+
-              ' * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA\n'+
-              ' */\n', {
-                data: {
-                  filename: filename,
-                  author: pkg.authors[0].name+ " ["+pkg.authors[0].email+"]",
-                  version: pkg.version
-                }
-              }
-            );
-          }
-        },
-        files: {
-          src: sourceFiles.concat(['source/test/**/*.js'])
-        }
-      }
-    },
-
     // make a zipfile
     compress: {
       qxClient: {
@@ -386,20 +341,11 @@ module.exports = function(grunt) {
 
     // protractor end-to-end tests
     protractor: {
-      options: {
-        configFile: "source/test/protractor/conf.js", // Default config file
-        args: {
-          // Arguments passed to the command
-        }
-      },
-      all: {},
-      ci: {
+      all: {
         options: {
+          configFile: "source/test/protractor/conf.js", // Default config file
           args: {
-            capabilities: {
-              // phantomjs is not recommended by the protractor team, and chrome seems not to work in ci
-              browserName: 'firefox'
-            }
+            // Arguments passed to the command
           }
         }
       },
@@ -419,34 +365,6 @@ module.exports = function(grunt) {
             capabilities: grunt.option('verbose') ? {loggingPrefs:{browser: 'ALL'}} : {}
           }
         }
-      },
-      screenshotsSource: {
-        options: {
-          configFile: "utils/protractor.conf.js",
-          args: {
-            params: {
-              subDir: "source"
-            },
-            capabilities: {
-              browserName: grunt.option('browserName') || 'firefox',
-              marionette: true
-            }
-          }
-        }
-      },
-      screenshotsManual: {
-        options: {
-          configFile: "utils/protractor.conf.js",
-          args: {
-            params: {
-              subDir: "manual"
-            },
-            capabilities: {
-              browserName: grunt.option('browserName') || 'firefox',
-              marionette: true
-            }
-          }
-        }
       }
     },
 
@@ -478,6 +396,12 @@ module.exports = function(grunt) {
       },
       build: {
         command: 'npm run make-cv'
+      },
+      composerInstallRest: {
+        command: 'composer install --prefer-dist --no-dev',
+        execOptions: {
+          cwd: 'source/rest/manager'
+        }
       }
     },
 
@@ -503,14 +427,6 @@ module.exports = function(grunt) {
           }
         }
       }
-    },
-    composer : {
-      rest: {
-        options : {
-          flags: ['prefer-dist', 'no-dev'],
-          cwd: 'source/rest/manager'
-        }
-      }
     }
   };
   grunt.initConfig(config);
@@ -533,33 +449,27 @@ module.exports = function(grunt) {
   });
 
     // Load the plugin tasks
-  grunt.loadNpmTasks('grunt-banner');
-  grunt.loadNpmTasks('grunt-contrib-compress');
-  grunt.loadNpmTasks('grunt-prompt');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-file-creator');
   grunt.loadNpmTasks('grunt-bump');
   grunt.loadNpmTasks('grunt-chmod');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-compress');
+  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-file-creator');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-protractor-runner');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-shell');
   grunt.loadNpmTasks('grunt-scaffold');
-  grunt.loadNpmTasks('grunt-composer');
+  grunt.loadNpmTasks('grunt-shell');
 
   // Default task runs all code checks, updates the banner and builds the release
   grunt.registerTask('release-build', [ 'release-cv', 'release-client' ]);
   grunt.registerTask('release-cv', [
-    'updateicons', 'clean', 'file-creator', 'shell:buildicons', 'composer:rest:install', 'shell:build',
+    'updateicons', 'clean', 'file-creator', 'shell:buildicons', 'shell:composerInstallRest', 'shell:build',
     'update-demo-config', 'chmod', 'compress:tar', 'compress:zip' ]);
 
   grunt.registerTask('release-client', ['shell:buildClient', 'compress:qxClient', 'compress:jqClient']);
 
-  grunt.registerTask('e2e', ['connect', 'protractor:ci']);
   grunt.registerTask('e2e-chrome', ['connect', 'protractor:all']);
   grunt.registerTask('screenshots', ['connect', 'protractor:screenshots']);
-  grunt.registerTask('screenshotsSource', ['connect', 'protractor:screenshotsSource']);
-  grunt.registerTask('screenshotsManual', ['connect', 'protractor:screenshotsManual']);
 
   // update icon submodule
   grunt.registerTask('updateicons', ['shell:updateicons']);

doc/manual/de/config/structure-tile/components/_static/shot-index.json

@@ -31,17 +31,17 @@
     "cv-value-progress-round": "deebcef4b1c5058f6119321a387a5e19",
     "cv-value-progress-semi-round": "f013e0e0653c36b209e81c0144f96628",
     "tile-nav-menu-icons": "bfb77d7a89a936997a9d54d327232b3b",
-    "cv-chart-temp": "2f9d46a2e45f88980135ca39897df058",
-    "cv-chart-pv": "5eb7a455f7115b0604dbe3ba8f87810a",
+    "cv-chart-temp": "1b0bdb039a9a27a3976544e0028aa36e",
+    "cv-chart-pv": "1a82f777655d17a472c27d5c447c841e",
     "cv-color": "8b62e900ca838a957fffebbff6d82aa4",
     "cv-color-popup": "b185b726da807a194a302ba5dcd98a13",
     "cv-tr064plugin-list": "cda76b2cc0a09a3569a1a717e60233a2",
     "cv-rsslogplugin-list": "50d4334df8669aabb127ed26fa120a97",
     "tile-context-menu-closed": "7d68d79aa3fba67e45466f53e11c7a2a",
     "tile-context-menu-open": "e4b36d0c2698d2c69dd505b0dcad5cce",
-    "cv-chart-pv-tooltip": "16fe99541e158c2e9ce43bb76d474ea4",
+    "cv-chart-pv-tooltip": "3c2062158854e043055211be5e605c83",
     "cv-value-progress-semi-round-color": "44c10f52dd8ed9ebb3460e240b512241",
-    "cv-chart-pv-bar": "0e880cc9eefb5180f78df68cdffac617",
-    "cv-chart-pv-nav": "d3db221349da8f77a221e05f92be3b0b",
-    "cv-chart-pv-nav-open": "93adc6928392a32e792f6b2a466439fe"
+    "cv-chart-pv-bar": "79f53323509ea27685bfff426bef6cd4",
+    "cv-chart-pv-nav": "890fba3bbdefc3c93bb7072dd091ed7d",
+    "cv-chart-pv-nav-open": "ffe3e950a3b3cc9f87d91d463c7bdf30"
 }