foreman_templates 11.0.2 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae628d7746868cc1744869f3f646a24e2059649e57427c7fcad010e91fb95b99
-  data.tar.gz: d3f7718a85ed604932f735200f9c4977c982dbb25dee3d4b7128ab8677d0ec4a
+  metadata.gz: 75eb8cb91582930aa38769e63d48875a956602705c61735ff1d8e24bf61c04c5
+  data.tar.gz: 7b37bd55a37a4433c041fa0528bc1704d06d159f278a42d82706d8e3ee1a68ec
 SHA512:
-  metadata.gz: cf2938fb35f9e7e77a313f41c98452c4ffdc51a34e853f7d7e7332593065bcdc25ce6032d80364a3ed568de1e86199738f2a3e9fe6e38899c2ad247fc7263abb
-  data.tar.gz: 81d80102f67e789691690651c4db071eb020677089514034e81223803f2da115fd79a8d82b7b5244c95c9c1855950a01194d853bdf7662f7917cc5232e8075b8
+  metadata.gz: b7326f2fa478d2c3aa3b87d03d6acf94ac8c72d7f74934c9db51025da09acd48befa323532e4319f7d68b1cf82df50d057f1b34eaa14e24e46f15f3612c710d6
+  data.tar.gz: ce2ff6b226016fd2bb09bbf96f32aa6f6e424a6efc8634f07b59dd8101ae541f725a96d42c1e1973870179280f62b7659ecaf58da0ac96292af0bd0e60715d9f

data/app/services/foreman_templates/action.rb

@@ -64,20 +64,20 @@ module ForemanTemplates
     protected
 
     def init_git_repo
-      git_repo = Git.init(@dir)
-
       case @http_proxy_policy
       when 'global'
         http_proxy_url = Setting[:http_proxy]
       when 'selected'
         http_proxy = HttpProxy.authorized(:view_http_proxies).with_taxonomy_scope.find(@http_proxy_id)
         http_proxy_url = http_proxy.full_url
+      end
+
+      git_repo = Git.init(@dir)
 
-        if URI(http_proxy_url).scheme == 'https' && http_proxy.cacert.present?
-          proxy_cert = "#{@dir}/.git/foreman_templates_proxy_cert_#{SecureRandom.hex(8)}.crt"
-          File.write(proxy_cert, http_proxy.cacert)
-          git_repo.config('http.proxySSLCAInfo', proxy_cert)
-        end
+      if @http_proxy_policy == 'selected' && URI(http_proxy_url).scheme == 'https' && http_proxy.cacert.present?
+        proxy_cert = "#{@dir}/.git/foreman_templates_proxy_cert_#{SecureRandom.hex(8)}.crt"
+        File.write(proxy_cert, http_proxy.cacert)
+        git_repo.config('http.proxySSLCAInfo', proxy_cert)
       end
 
       if http_proxy_url.present?

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = "11.0.2".freeze
+  VERSION = "11.0.3".freeze
 end

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncForm.test.js

@@ -101,7 +101,9 @@ describe('NewTemplateSyncForm', () => {
       url: '/ui_template_syncs/import',
       params: {
         associate: 'new',
+        location_ids: [2],
         negate: false,
+        organization_ids: [1],
         repo: 'https://github.com/theforeman/community-templates.git',
       },
       handleSuccess: expect.any(Function),

data/webpack/test_setup.js

@@ -0,0 +1 @@
+import 'foremanJSTestSetup';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.3
 platform: ruby
 authors:
 - Greg Sutcliffe
@@ -155,7 +155,7 @@ files:
 - webpack/consts.js
 - webpack/global_index.js
 - webpack/index.js
-- webpack/testSetup.js
+- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_templates
 licenses:
 - GPL-3.0
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Template-syncing engine for Foreman
 test_files: []

data/webpack/testSetup.js

@@ -1,12 +0,0 @@
-import 'core-js/shim';
-import 'regenerator-runtime/runtime';
-
-import { configure } from '@theforeman/test';
-import Adapter from 'enzyme-adapter-react-16';
-
-configure({ adapter: new Adapter() });
-
-// Mocking translation function
-global.__ = str => str;
-global.n__ = str => str;
-global.Jed = { sprintf: str => str };