(maint) Refactor XSD validation in acceptance tests

puppetlabs · Jun 26, 2017 · d28c11e · d28c11e
1 parent 8461bfb
commit d28c11e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/spec/acceptance/support/it_generates_valid_junit_xml.rb b/spec/acceptance/support/it_generates_valid_junit_xml.rb
@@ -0,0 +1,6 @@
+RSpec.shared_examples_for :it_generates_valid_junit_xml do
+  its(:stdout) do
+    xsd = File.join(RSpec.configuration.fixtures_path, 'JUnit.xsd')
+    is_expected.to pass_validation(xsd)
+  end
+end
diff --git a/spec/acceptance/validate_metadata_spec.rb b/spec/acceptance/validate_metadata_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'Running metadata validation' do
-  let(:junit_xsd) { File.join(RSpec.configuration.fixtures_path, 'JUnit.xsd') }
   let(:spinner_text) { %r{checking metadata\.json}i }
 
   context 'with a fresh module' do
@@ -16,7 +15,7 @@
     describe command('pdk validate metadata --format junit') do
       its(:exit_status) { is_expected.to eq(0) }
       its(:stderr) { is_expected.to match(spinner_text) }
-      its(:stdout) { is_expected.to pass_validation(junit_xsd) }
+      it_behaves_like :it_generates_valid_junit_xml
 
       its(:stdout) do
         is_expected.to have_xpath('/testsuites/testsuite[@name="metadata-json-lint"]').with_attributes(
@@ -54,7 +53,7 @@
     describe command('pdk validate metadata --format junit') do
       its(:exit_status) { is_expected.to eq(1) }
       its(:stderr) { is_expected.to match(spinner_text) }
-      its(:stdout) { is_expected.to pass_validation(junit_xsd) }
+      it_behaves_like :it_generates_valid_junit_xml
 
       its(:stdout) do
         is_expected.to have_xpath('/testsuites/testsuite[@name="metadata-json-lint"]').with_attributes(

diff --git a/spec/acceptance/validate_ruby_spec.rb b/spec/acceptance/validate_ruby_spec.rb
@@ -23,7 +23,7 @@
     describe command('pdk validate ruby --format junit') do
       its(:exit_status) { is_expected.to eq(0) }
       its(:stderr) { is_expected.to match(%r{checking ruby code style}i) }
-      its(:stdout) { is_expected.to pass_validation(junit_xsd) }
+      it_behaves_like :it_generates_valid_junit_xml
 
       its(:stdout) do
         is_expected.to have_xpath('/testsuites/testsuite[@name="rubocop"]').with_attributes(
@@ -96,7 +96,7 @@
     describe command('pdk validate ruby --format junit') do
       its(:exit_status) { is_expected.not_to eq(0) }
       its(:stderr) { is_expected.to match(%r{checking ruby code style}i) }
-      its(:stdout) { is_expected.to pass_validation(junit_xsd) }
+      it_behaves_like :it_generates_valid_junit_xml
 
       its(:stdout) do
         is_expected.to have_xpath('/testsuites/testsuite[@name="rubocop"]').with_attributes(