partkeepr

commit c2b0bf22514eaad5189f4f5eec2c209226149094
parent fdc49e177f7c68a58c6d80bd282de2d3b097a9d0
Author: Felicitus <felicitus@felicitus.org>
Date:   Mon, 16 Nov 2015 23:26:16 +0100

Fixed test for existing configuration

Diffstat:
M
src/PartKeepr/SetupBundle/Controller/ExistingConfigParserController.php
 | 
3
+++
M
web/setup/js/SetupSteps/AdminUserSetup.js
 | 
2
+-
M
web/setup/js/SetupTests/ExistingConfigurationTest.js
 | 
1
-

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/PartKeepr/SetupBundle/Controller/ExistingConfigParserController.php b/src/PartKeepr/SetupBundle/Controller/ExistingConfigParserController.php
@@ -38,6 +38,9 @@ class ExistingConfigParserController extends SetupController
 
             if (count($response["config"]) == 0) {
                 $response["message"] = "No configuration found";
+                $response["config"]["existingConfig"] = false;
+            } else {
+                $response["config"]["existingConfig"] = true;
             }
 
         } catch (\Exception $e) {
diff --git a/web/setup/js/SetupSteps/AdminUserSetup.js b/web/setup/js/SetupSteps/AdminUserSetup.js
@@ -10,7 +10,7 @@ Ext.define('PartKeeprSetup.AdminUserSetup', {
     onBeforeRunTest: function () {
         this.callParent(arguments);
 
-        if (PartKeeprSetup.getApplication().getSetupConfig().existingConfig) {
+        if (PartKeeprSetup.getApplication().getSetupConfig().existingConfig === true) {
             this.skip = true;
         }
     }
diff --git a/web/setup/js/SetupTests/ExistingConfigurationTest.js b/web/setup/js/SetupTests/ExistingConfigurationTest.js
@@ -12,7 +12,6 @@ Ext.define('PartKeeprSetup.ExistingConfigurationTest', {
             var config = PartKeeprSetup.getApplication().getSetupConfig();
 
             Ext.merge(config.values, data.config);
-            config.existingConfig = true;
         }
     }
 });