From b8a23d3617c97767257c3de86e7e16fa1f1387c9 Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Thu, 28 Apr 2016 16:41:04 -0700
Subject: [PATCH] (maint) Update acceptance tests to use gem

Prior to this commit, the acceptance tests were trying to install
strings as a module and failing due to the fact that strings has
transition to a gem and does not have metadata. Update the tests
so that they install strings as a gem instead.
---
 Rakefile                                                | 2 +-
 spec/acceptance/nodesets/{fedora20.yml => fedora23.yml} | 4 ++--
 spec/spec_helper_acceptance.rb                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename spec/acceptance/nodesets/{fedora20.yml => fedora23.yml} (88%)

diff --git a/Rakefile b/Rakefile
index 3bda0b1..5ca19fd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,7 +18,7 @@ task :validate do
 end
 
 task :acceptance do
-  sh "puppet module build"
+  sh "gem build puppet-strings.gemspec"
   sh "puppet module build spec/unit/puppet/examples/test"
   sh "BEAKER_set=#{ENV["platform"]} rspec spec/acceptance/*.rb"
 end
diff --git a/spec/acceptance/nodesets/fedora20.yml b/spec/acceptance/nodesets/fedora23.yml
similarity index 88%
rename from spec/acceptance/nodesets/fedora20.yml
rename to spec/acceptance/nodesets/fedora23.yml
index 718f632..1e1c3ee 100644
--- a/spec/acceptance/nodesets/fedora20.yml
+++ b/spec/acceptance/nodesets/fedora23.yml
@@ -2,9 +2,9 @@ HOSTS:
   master:
     roles:
       - master
-    platform: fedora-20-x86_64
+    platform: fedora-23-x86_64
     hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/fedora-20-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/fedora-23-x86_64
 CONFIG:
   filecount: 12
   datastore: instance0
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 5b230d3..5a69594 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -14,8 +14,8 @@ RSpec.configure do |c|
   c.before :suite do
 
   hosts.each do |host|
-      scp_to(host, Dir.glob('pkg/puppetlabs-strings*.gz').first, 'strings.tar.gz')
-      on host, puppet('module', 'install', 'strings.tar.gz')
+      scp_to(host, Dir.glob('puppet-strings*.gem').first, 'puppet-strings.gem')
+      on host, 'gem install puppet-strings.gem'
 
       scp_to(host, Dir.glob('spec/unit/puppet/examples/test/pkg/username-test*.gz').first, 'test.tar.gz')
       on host, puppet('module', 'install', 'test.tar.gz')