Bump to 0.21.0 for Katello 3.15 (#724)

* Update 3.15 API data * Fix tests undo test changes * Bump to 0.21.0 for Katello 3.15
Katello · Feb 25, 2020 · a348e30 · a348e30
1 parent 3c82511
commit a348e30
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,4 @@ rvm:
   - 2.4
   - 2.5
 before_install:
-  - echo "gem 'hammer_cli_foreman', :git => 'https://github.com/theforeman/hammer-cli-foreman.git'" > Gemfile.local
-  - echo "gem 'hammer_cli', :git => 'https://github.com/theforeman/hammer-cli.git'" >> Gemfile.local
   - gem update bundler
diff --git a/hammer_cli_katello.gemspec b/hammer_cli_katello.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version = HammerCLIKatello.version
 
-  gem.add_dependency 'hammer_cli_foreman'
+  gem.add_dependency 'hammer_cli_foreman', '~> 2.0.0'
   gem.add_dependency 'hammer_cli_foreman_tasks'
   gem.add_dependency 'hammer_cli_foreman_bootdisk'
   gem.add_dependency 'hammer_cli_foreman_docker'

diff --git a/lib/hammer_cli_katello/repository.rb b/lib/hammer_cli_katello/repository.rb
@@ -316,7 +316,7 @@ def request_headers
 
       def execute
         @failure = false
-        files = option_content
+        files = option_content.sort
 
         if files.length.zero?
           output.print_error _("Could not find any files matching PATH")

diff --git a/lib/hammer_cli_katello/version.rb b/lib/hammer_cli_katello/version.rb
@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.21-master')
+    @version ||= Gem::Version.new('0.21.0')
   end
 end
diff --git a/test/data/3.15/foreman_api.json b/test/data/3.15/foreman_api.json
diff --git a/test/functional/host/extensions/update_test.rb b/test/functional/host/extensions/update_test.rb
@@ -29,13 +29,13 @@ module HammerCLIForeman
           with_params('id' => host_id.to_s,
                       'organization_id' => organization_id,
                       'host' => {
-                        'puppetclass_ids' => [],
                         'compute_attributes' => {},
                         'content_facet_attributes' => {
                           'content_view_id' => cv_id,
                           'lifecycle_environment_id' => env_id,
                           'kickstart_repository_id' => repo_id
-                        }
+                        },
+                        'subscription_facet_attributes' => {}
                       })
 
         cmd = "host update --id=#{host_id}"\

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -14,7 +14,7 @@
 require File.join(File.dirname(__FILE__), './task_helper.rb')
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'hammer_cli'
 
 KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.15')