Merge pull request #79 from matomo-org/new-version2

1.4.0
matomo-org · Jun 4, 2020 · b48161f · b48161f
2 parents 8f9ef31 + 3b8839b
commit b48161f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+# 1.4.0
+
+Changes:
+* Update google API client for PHP 7.4 support.
+
 # 1.3.3
 
 Changes:

diff --git a/plugin.json b/plugin.json
@@ -1,7 +1,7 @@
 {
     "name": "GoogleAnalyticsImporter",
     "description": "Import reports from a Google Analytics account into Matomo.",
-    "version": "1.3.3",
+    "version": "1.4.0",
     "theme": false,
     "require": {
         "piwik": ">=3.12.0-b1,<4.0.0-b1"

diff --git a/tests/UI/GoogleAnalyticsImporter_spec.js b/tests/UI/GoogleAnalyticsImporter_spec.js
@@ -88,10 +88,17 @@ describe("GoogleAnalyticsImporter", function () {
     });
 
     it("should show that the import finished when the import finishes", async function () {
-        await page.waitFor(125000);
+        while (true) { // wait until import finishes
+            await page.waitFor(30000);
 
-        await page.reload({ timeout: 0 });
-        await page.waitFor('.pageWrap');
+            await page.reload();
+            await page.waitFor('.pageWrap');
+
+            const elem = await page.$('td.actions > a.icon-delete');
+            if (elem) {
+                break;
+            }
+        }
 
         await removeStartResumeFinishTime();