Revert "Merge pull request #9322 from GilbertCherrie/update_jquery"

This reverts commit 63161e6, reversing
changes made to 3d293ed.

Author: jrafanie

app/javascript/oldjs/import.js

@@ -65,7 +65,8 @@ window.ImportSetup = {
   listenForGitPostMessages: function() {
     window.addEventListener('message', function(event) {
       var messageData = event.data.message;
-      if (messageData && messageData.level === 'error') {
+
+      if (messageData.level === 'error') {
         showErrorMessage(messageData.message);
         $('#git-url-import').prop('disabled', null);
       } else if (event.data.git_branches || event.data.git_tags) {

app/javascript/spec/ops-tenant-form/ops-tenant-form.spec.js

@@ -52,9 +52,6 @@ describe('OpstTenantForm', () => {
   });
 
   it('should mount and set initialValues', async(done) => {
-    fetchMock.getOnce('/api/tenants?filter[]=name=&expand=resources', {
-      resources: [],
-    });
     fetchMock.getOnce('/api/tenants/123?expand=resources&attributes=name,description,use_config_for_attributes,ancestry,divisible', {
       name: 'foo',
     });

config/jest.setup.js

@@ -53,11 +53,7 @@ ManageIQ.redux.store.injectReducers();
 
 Object.defineProperty(Array.prototype, 'flat', {
     value: function(depth = 1) {
-      let array = this;
-      if (typeof this === 'object') {
-        array = Object.keys(this).map((key) => this[key])
-      }
-      return array.reduce(function (flat, toFlatten) {
+      return this.reduce(function (flat, toFlatten) {
         return flat.concat((Array.isArray(toFlatten) && (depth>1)) ? toFlatten.flat(depth-1) : toFlatten);
       }, []);
     }

package.json

@@ -72,7 +72,7 @@
     "eonasdan-bootstrap-datetimepicker": "~4.17.49",
     "es6-shim": "~0.35.3",
     "history": "^4.7.2",
-    "jquery": "~3.7.1",
+    "jquery": "~2.2.4",
     "jquery-ui": "~1.13.2",
     "jquery-ujs": "~1.2.2",
     "jquery.hotkeys": "~0.1.0",
@@ -190,7 +190,6 @@
     "cross-spawn": "~7.0.5",
     "decode-uri-component": "^0.2.2",
     "express": "^4.18.2",
-    "jquery": "~3.7.1",
     "lodash": "~4.17.21",
     "minimatch": "~3.1.2",
     "moment": "^2.30.1",

spec/javascripts/automate_import_export_spec.js

@@ -263,8 +263,8 @@ describe('Automate', function() {
         it('refreshes the selectpicker for git-branches and git-tags', function() {
           Automate.renderGitImport(['branches'], ['tags'], '123', {message: 'the message', level: 'warning'});
           expect($.fn.selectpicker.calls.allArgs()).toEqual([['refresh'], ['refresh']]);
-          expect($.fn.selectpicker.calls.first().object[0].className).toEqual('git-branches');
-          expect($.fn.selectpicker.calls.mostRecent().object[0].className).toEqual('git-tags');
+          expect($.fn.selectpicker.calls.first().object.selector).toEqual('select.git-branches');
+          expect($.fn.selectpicker.calls.mostRecent().object.selector).toEqual('select.git-tags');
         });
       });
 

spec/javascripts/import_spec.js

@@ -120,6 +120,7 @@ describe('import.js', function() {
 
           it('disables the git-url-import', function() {
             expect($.fn.prop).toHaveBeenCalledWith('disabled', null);
+            expect($.fn.prop.calls.mostRecent().object.selector).toEqual('#git-url-import');
           });
 
           it('turns the spinner off', function() {

spec/javascripts/miq_application_spec.js

@@ -6,7 +6,7 @@ describe('miq_application.js', function() {
     });
 
     it('verify serialize method doesnt convert line feed value to windows line feed', function() {
-      expect(miqSerializeForm('form_div')).toEqual('method_data=new%20line%20added%0A%0A');
+      expect(miqSerializeForm('form_div')).toEqual("method_data=new+line+added%0A%0A");
     });
   });
 

spec/javascripts/services/miq_service_spec.js

@@ -57,6 +57,7 @@ describe('miqService', function() {
 
     it('refreshes all selects', function() {
       testService.refreshSelectpicker();
+      expect($.fn.selectpicker.calls.mostRecent().object.selector).toEqual('select');
       expect($.fn.selectpicker.calls.mostRecent().args[0]).toEqual('refresh');
     });
   });

yarn.lock

@@ -10779,13 +10779,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jquery@npm:~3.7.1":
+"jquery@npm:1.8 - 4, jquery@npm:>=1.7, jquery@npm:>=1.7.0, jquery@npm:>=1.8.0 <4.0.0, jquery@npm:>=1.9.0, jquery@npm:>=3.4.0 <4.0.0, jquery@npm:^3.4.1, jquery@npm:^3.5.1":
   version: 3.7.1
   resolution: "jquery@npm:3.7.1"
   checksum: 10/17be9929f5fa37697d9848284f0d108c543318ef79ec794e130cd0c49f6c050d60c803a69e8cfa16fa19f5ff7cdb814a6905cceab0831186560c65ed113cd579
   languageName: node
   linkType: hard
 
+"jquery@npm:^2.2.4, jquery@npm:~2.2.4":
+  version: 2.2.4
+  resolution: "jquery@npm:2.2.4"
+  checksum: 10/fe1bb90423eda61255b969fed0420dfb09dc055793b83ad380a2fbe5b5ce3bc747029d010e580bf39c95bdd07fb309ef8c0fc22a700ca97015311626881db152
+  languageName: node
+  linkType: hard
+
+"jquery@npm:~3.4.1":
+  version: 3.4.1
+  resolution: "jquery@npm:3.4.1"
+  checksum: 10/c40dcf94f6d1427b8d28b8f6b9d32f368b01e77cc24095c66c02de146faf0e633ef7c7f5d5815c52367b400f32d7c7f9c87e66d372488ffdd3276b4aeb6e0cef
+  languageName: node
+  linkType: hard
+
 "js-base64@npm:^2.1.9":
   version: 2.6.4
   resolution: "js-base64@npm:2.6.4"
@@ -11728,7 +11742,7 @@ __metadata:
     jasmine-jquery: "npm:~2.1.1"
     jest: "npm:~24.9.0"
     jest-cli: "npm:~24.9.0"
-    jquery: "npm:~3.7.1"
+    jquery: "npm:~2.2.4"
     jquery-ui: "npm:~1.13.2"
     jquery-ujs: "npm:~1.2.2"
     jquery.hotkeys: "npm:~0.1.0"