commit 80787fdadefa176c8af5b6f5a2cae64f4a6b01ab
author エリス <erisu@users.noreply.github.com> Thu Jan 19 22:24:17 2023 +0900
committer GitHub <noreply@github.com> Thu Jan 19 22:24:17 2023 +0900
tree e82bcd3ec176be36731771bb845fc40c96df4aa0
parent 96b22fdfb8c14f4160cc4f83970069bae1b0b06c

fix(android): change order of project setup & plugin install (#253)

* fix: install plugin after test framework plugins
* fix: change the order of how the project is prepared

lib/ParamedicApp.js

diff --git a/lib/ParamedicApp.js b/lib/ParamedicApp.js
index 4597885..e9cbae7 100644
--- a/lib/ParamedicApp.js
+++ b/lib/ParamedicApp.js
@@ -56,9 +56,9 @@
     }
 
     prepareProjectToRunTests () {
-        this.installPlugins();
-        this.setUpStartPage();
         return this.installPlatform()
+            .then(() => this.installPlugins())
+            .then(() => this.setUpStartPage())
             .then(() => this.checkPlatformRequirements())
             .then(() => this.checkDumpAndroidManifest())
             .then(() => this.checkDumpAndroidConfigXml());
@@ -67,28 +67,32 @@
     installPlugins () {
         logger.info('cordova-paramedic: installing plugins');
         const pluginsManager = new PluginsManager(this.tempFolder.name, this.storedCWD, this.config);
-        pluginsManager.installPlugins(this.config.getPlugins());
-        pluginsManager.installTestsForExistingPlugins();
 
-        const additionalPlugins = ['github:apache/cordova-plugin-test-framework', path.join(__dirname, '..', 'paramedic-plugin')];
+        const ciFrameworkPlugins = ['github:apache/cordova-plugin-test-framework', path.join(__dirname, '..', 'paramedic-plugin')];
 
         if (this.config.shouldUseSauce() && !this.config.getUseTunnel()) {
-            additionalPlugins.push(path.join(__dirname, '..', 'event-cache-plugin'));
+            ciFrameworkPlugins.push(path.join(__dirname, '..', 'event-cache-plugin'));
         }
 
         if (this.isWindows) {
-            additionalPlugins.push(path.join(__dirname, '..', 'debug-mode-plugin'));
+            ciFrameworkPlugins.push(path.join(__dirname, '..', 'debug-mode-plugin'));
         }
 
         if (this.isIos) {
-            additionalPlugins.push(path.join(__dirname, '..', 'ios-geolocation-permissions-plugin'));
+            ciFrameworkPlugins.push(path.join(__dirname, '..', 'ios-geolocation-permissions-plugin'));
         }
 
         if (this.config.isCI()) {
-            additionalPlugins.push(path.join(__dirname, '..', 'ci-plugin'));
+            ciFrameworkPlugins.push(path.join(__dirname, '..', 'ci-plugin'));
         }
 
-        pluginsManager.installPlugins(additionalPlugins);
+        // Install testing framework
+        logger.info('cordova-paramedic: installing ci framework plugins: ' + ciFrameworkPlugins.join(', '));
+        pluginsManager.installPlugins(ciFrameworkPlugins);
+        logger.info('cordova-paramedic: installing plugins:' + this.config.getPlugins().join(', '));
+        pluginsManager.installPlugins(this.config.getPlugins());
+        logger.info('cordova-paramedic: installing tests for existing plugins');
+        pluginsManager.installTestsForExistingPlugins();
     }
 
     setUpStartPage () {