chore: fix broken CI build / test

silkimen · Mar 30, 2022 · 1a1c9e0 · 1a1c9e0
1 parent ea15617
commit 1a1c9e0
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 112 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,63 +3,68 @@ name: Cordova HTTP Plugin CI
 on: [push]
 
 env:
-  nodejs: '10.x'
+  nodejs: "16.x"
+  BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+  BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
 
 jobs:
   test-www-interface:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Node.js ${{ env.nodejs }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ env.nodejs }}
-    - name: Install node modules
-      run: npm ci
-    - name: Run WWW interface tests
-      run: npm run testjs
+      - uses: actions/checkout@v1
+      - name: Install Node.js ${{ env.nodejs }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.nodejs }}
+      - name: Install node modules
+        run: npm ci
+      - name: Run WWW interface tests
+        run: npm run testjs
 
   build-ios:
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Node.js ${{ env.nodejs }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ env.nodejs }}
-    - name: Install node modules
-      run: npm ci
-    - name: Update test cert for httpbin.org
-      run: npm run updatecert
-    - name: Build test app
-      run: scripts/build-test-app.sh --ios --emulator
+      - uses: actions/checkout@v1
+      - name: Install Node.js ${{ env.nodejs }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.nodejs }}
+      - name: Install node modules
+        run: npm ci
+      - name: Update test cert for httpbin.org
+        run: npm run updatecert
+      - name: Build test app
+        run: scripts/build-test-app.sh --ios --emulator
+      - name: Upload artifact to BrowserStack
+        if: env.BROWSERSTACK_USERNAME != ''
+        run: scripts/upload-browserstack.sh --ios
+      - name: Run e2e tests
+        if: env.BROWSERSTACK_USERNAME != ''
+        run: scripts/test-app.sh --ios --device
 
   build-android:
     runs-on: ubuntu-latest
-    env:
-      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Node.js ${{ env.nodejs }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ env.nodejs }}
-    - name: Install node modules
-      run: npm ci
-    - name: Install JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Update test cert for httpbin.org
-      run: npm run updatecert
-    - name: Add workaround for missing DX files in build-tools 31 (https://stackoverflow.com/a/68430992)
-      run: ln -s $ANDROID_HOME/build-tools/31.0.0/d8 $ANDROID_HOME/build-tools/31.0.0/dx && ln -s $ANDROID_HOME/build-tools/31.0.0/lib/d8.jar $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar
-    - name: Build test app
-      run: scripts/build-test-app.sh --android --device
-    - name: Upload artifact to BrowserStack
-      if: env.BROWSERSTACK_USERNAME != ''
-      run: scripts/upload-browserstack.sh --android
-    - name: Run e2e tests
-      if: env.BROWSERSTACK_USERNAME != ''
-      run: scripts/test-app.sh --android --device
+      - uses: actions/checkout@v1
+      - name: Install Node.js ${{ env.nodejs }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.nodejs }}
+      - name: Install node modules
+        run: npm ci
+      - name: Install JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Update test cert for httpbin.org
+        run: npm run updatecert
+      - name: Add workaround for missing DX files in build-tools 32 (https://stackoverflow.com/a/68430992)
+        run: ln -s $ANDROID_HOME/build-tools/32.0.0/d8 $ANDROID_HOME/build-tools/32.0.0/dx && ln -s $ANDROID_HOME/build-tools/32.0.0/lib/d8.jar $ANDROID_HOME/build-tools/32.0.0/lib/dx.jar
+      - name: Build test app
+        run: scripts/build-test-app.sh --android --device
+      - name: Upload artifact to BrowserStack
+        if: env.BROWSERSTACK_USERNAME != ''
+        run: scripts/upload-browserstack.sh --android
+      - name: Run e2e tests
+        if: env.BROWSERSTACK_USERNAME != ''
+        run: scripts/test-app.sh --android --device
diff --git a/.travis.yml b/.travis.yml
@@ -7,52 +7,52 @@ addons:
 
 matrix:
   include:
-  - name: "iOS Build & Test"
-    language: objective-c
-    sudo: false
-    os: osx
-    osx_image: xcode12.5
-
-    before_install:
-    - export LANG=en_US.UTF-8 &&
-      nvm use 14
-
-    install:
-    - npm install
-
-    script:
-    - npm run testjs &&
-      npm run updatecert &&
-      scripts/build-test-app.sh --ios --emulator &&
-      scripts/upload-saucelabs.sh --ios &&
-      scripts/test-app.sh --ios --emulator;
-
-  - name: "Android Build & Test"
-    language: android
-    sudo : required
-
-    android:
-      components:
-        - tools
-        - platform-tools
-        - build-tools-28.0.3
-        - android-28
-        - extra-android-support
-        - extra-android-m2repository
-        - extra-google-m2repository
-
-    before_install:
-    - export LANG=en_US.UTF-8 &&
-      curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&
-      sudo apt-get install -y nodejs
-    - yes | sdkmanager --update
-
-    install:
-    - npm install
-
-    script:
-    - npm run testjs &&
-      npm run updatecert &&
-      scripts/build-test-app.sh --android --emulator &&
-      scripts/upload-saucelabs.sh --android &&
-      scripts/test-app.sh --android --emulator;
+    - name: "iOS Build & Test"
+      language: objective-c
+      sudo: false
+      os: osx
+      osx_image: xcode12.5
+
+      before_install:
+        - export LANG=en_US.UTF-8 &&
+          nvm use 14
+
+      install:
+        - npm install
+
+      script:
+        - npm run testjs &&
+          npm run updatecert &&
+          scripts/build-test-app.sh --ios --emulator &&
+          scripts/upload-saucelabs.sh --ios &&
+          scripts/test-app.sh --ios --emulator;
+
+    - name: "Android Build & Test"
+      language: android
+      sudo: required
+
+      android:
+        components:
+          - tools
+          - platform-tools
+          - build-tools-30.0.1
+          - android-28
+          - extra-android-support
+          - extra-android-m2repository
+          - extra-google-m2repository
+
+      before_install:
+        - export LANG=en_US.UTF-8 &&
+          curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&
+          sudo apt-get install -y nodejs
+        - yes | sdkmanager --update
+
+      install:
+        - npm install
+
+      script:
+        - npm run testjs &&
+          npm run updatecert &&
+          scripts/build-test-app.sh --android --emulator &&
+          scripts/upload-saucelabs.sh --android &&
+          scripts/test-app.sh --android --emulator;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "cordova": "10.0.0",
     "mocha": "8.2.0",
     "umd-tough-cookie": "2.4.3",
-    "wd": "1.12.1",
+    "wd": "1.14.0",
     "xml2js": "0.4.23"
   }
 }
diff --git a/test/e2e-app-template/package.json b/test/e2e-app-template/package.json
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "cordova": "10.0.0",
-    "cordova-android": "9.0.0",
+    "cordova-android": "10.1.1",
     "cordova-browser": "6.0.0",
     "cordova-ios": "6.2.0",
     "cordova-plugin-device": "2.0.3",

diff --git a/test/e2e-specs.js b/test/e2e-specs.js
@@ -52,6 +52,19 @@ const helpers = {
     xhr.open('GET', url);
     xhr.send();
   },
+  readFileEntryAsText: function(fileEntry, onSuccess, onFail) {
+    var reader = new FileReader();
+
+    reader.onerror = onFail;
+
+    reader.onloadend = function() {
+      onSuccess(reader.result);
+    };
+
+    fileEntry.file(function(file) {
+      reader.readAsText(file);
+    }, onFail);
+  },
   writeToFile: function (done, fileName, content) {
     window.resolveLocalFileSystemURL(cordova.file.cacheDirectory, function (directoryEntry) {
       directoryEntry.getFile(fileName, { create: true, exclusive: false }, function (fileEntry) {
@@ -342,15 +355,15 @@ const tests = [
       var targetPath = cordova.file.cacheDirectory + 'test.xml';
 
       cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
+        helpers.readFileEntryAsText(entry, function(content) {
           resolve({
             sourceUrl: sourceUrl,
             targetPath: targetPath,
             fullPath: entry.fullPath,
             name: entry.name,
             content: content
           });
-        }, targetPath);
+        }, reject);
       }, reject);
     },
     validationFunc: function (driver, result) {
@@ -520,15 +533,15 @@ const tests = [
       cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
 
       cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
+        helpers.readFileEntryAsText(entry, function (content) {
           resolve({
             sourceUrl: sourceUrl,
             targetPath: targetPath,
             fullPath: entry.fullPath,
             name: entry.name,
             content: content
           });
-        }, targetPath);
+        }, reject);
       }, reject);
     },
     validationFunc: function (driver, result) {
@@ -697,15 +710,15 @@ const tests = [
       var targetPath = cordova.file.cacheDirectory + 'test.xml';
 
       cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function (entry) {
-        helpers.getWithXhr(function (content) {
+        helpers.readFileEntryAsText(entry, function (content) {
           resolve({
             sourceUrl: sourceUrl,
             targetPath: targetPath,
             fullPath: entry.fullPath,
             name: entry.name,
             content: content
           });
-        }, targetPath);
+        }, reject);
       }, reject);
     },
     validationFunc: function (driver, result) {

diff --git a/test/e2e-tooling/caps.js b/test/e2e-tooling/caps.js
@@ -64,7 +64,7 @@ const configs = {
     os_version: '14',
     project: 'HTTP Test App',
     autoWebview: true,
-    app: 'HttpTestAppAndroid',
+    app: 'HttpTestAppIos',
     'browserstack.networkLogs': false
   },
   browserstackAndroidDevice: {