Merge pull request #222 from Inchoo/bugfix/#199-module-breaks-search-engine-switcher

Bugfix/#199 module breaks search engine switcher

Author: vvuksan

Diff for: view/adminhtml/requirejs-config.js

@@ -13,7 +13,7 @@ let config = {
             customSnippets: 'Fastly_Cdn/js/custom-snippets',
             setServiceLabel: 'Fastly_Cdn/js/service-label',
             popup: 'Fastly_Cdn/js/popup',
-            testConnection: 'Fastly_Cdn/js/testconnection',
+            fastlyTestConnection: 'Fastly_Cdn/js/testconnection',
             resetAllMessages: 'Fastly_Cdn/js/reset-all-messages',
             showErrorMessage: 'Fastly_Cdn/js/error-message',
             showSuccessMessage: 'Fastly_Cdn/js/success-message',

Diff for: view/adminhtml/web/js/init.js

@@ -62,6 +62,10 @@ define([
                 $('#row_system_full_page_cache_fastly_fastly_web_application_firewall_owasp_restricted_extensions').hide();
                 $('#row_system_full_page_cache_fastly_fastly_web_application_firewall_owasp_allowed_methods').hide();
 
+                requirejs(['fastlyTestConnection'], function (fastlyTestConnection) {
+                    fastlyTestConnection(config);
+                });
+
                 $.ajax({
                     type: "GET",
                     url: config.serviceInfoUrl,
@@ -77,10 +81,6 @@ define([
                             uploadVcl(config, serviceStatus, isAlreadyConfigured);
                         });
 
-                        requirejs(['testConnection'], function (testConnection) {
-                            testConnection(config);
-                        });
-
                         advancedConfigurationHead.one('click', function () {
                             requirejs(['tls'], function (tls) {
                                 tls(config, serviceStatus, isAlreadyConfigured);