foreman_templates 11.0.1 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31bc6cfb67029144119c8710837cf7953bf109e87f2c977430e1d60a01e77551
-  data.tar.gz: ac21512525a3ea0b4bb89c658f2db1ed25e73fd3b0a0af3f52ab51fb8f39308b
+  metadata.gz: 75eb8cb91582930aa38769e63d48875a956602705c61735ff1d8e24bf61c04c5
+  data.tar.gz: 7b37bd55a37a4433c041fa0528bc1704d06d159f278a42d82706d8e3ee1a68ec
 SHA512:
-  metadata.gz: f619b57c2f02f6fed537eebf956c4c076d56740507bf668acbcc7de81de95722e4ea4e0b5ccdaf595af9d999b3df4f32a21829c48c622023624986b7e1a317be
-  data.tar.gz: 6205209e8e66e857653f148909b2bf9a874e3488abcdcdd7d5dec9e000b10d6b914e6c2402a75ec029989eafafbed1c8bbab78c6f01684885f6b0ec5fef8f6e5
+  metadata.gz: b7326f2fa478d2c3aa3b87d03d6acf94ac8c72d7f74934c9db51025da09acd48befa323532e4319f7d68b1cf82df50d057f1b34eaa14e24e46f15f3612c710d6
+  data.tar.gz: ce2ff6b226016fd2bb09bbf96f32aa6f6e424a6efc8634f07b59dd8101ae541f725a96d42c1e1973870179280f62b7659ecaf58da0ac96292af0bd0e60715d9f

data/Rakefile

@@ -4,21 +4,6 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ForemanTemplates'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 Bundler::GemHelper.install_tasks
 task :default => :test

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.1".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.1
+  version: 11.0.3
 platform: ruby
 authors:
 - Greg Sutcliffe
@@ -37,48 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: theforeman-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Engine to synchronise provisioning templates from GitHub
 email: gsutclif@redhat.com
 executables: []
@@ -197,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
@@ -216,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+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 };