From 1da95854e079c795d65ae37f0cdcd27c3ad603ce Mon Sep 17 00:00:00 2001
From: Rob Nelson <rnelson0@gmail.com>
Date: Tue, 13 Dec 2016 23:28:38 +0000
Subject: [PATCH] Update spec tests to adjust for failing to parse validated
 files

---
 spec/fixtures/test/manifests/ignore_multiple_block.pp | 6 +++---
 spec/fixtures/test/manifests/ignore_multiple_line.pp  | 4 ++--
 spec/puppet-lint/bin_spec.rb                          | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec/fixtures/test/manifests/ignore_multiple_block.pp b/spec/fixtures/test/manifests/ignore_multiple_block.pp
index 85780626..d946a84b 100644
--- a/spec/fixtures/test/manifests/ignore_multiple_block.pp
+++ b/spec/fixtures/test/manifests/ignore_multiple_block.pp
@@ -1,6 +1,6 @@
 # lint:ignore:double_quoted_strings lint:ignore:quoted_booleans
-"true"
-"false"
+$x = "true"
+$y = "false"
 # lint:endignore
 
-"true"
+$z = "true"
diff --git a/spec/fixtures/test/manifests/ignore_multiple_line.pp b/spec/fixtures/test/manifests/ignore_multiple_line.pp
index ce9b374d..6a1cdf0f 100644
--- a/spec/fixtures/test/manifests/ignore_multiple_line.pp
+++ b/spec/fixtures/test/manifests/ignore_multiple_line.pp
@@ -1,2 +1,2 @@
-"true" # lint:ignore:double_quoted_strings lint:ignore:quoted_booleans
-"false" # lint:ignore:quoted_booleans lint:ignore:double_quoted_strings reason
+$x = "true" # lint:ignore:double_quoted_strings lint:ignore:quoted_booleans
+$y = "false" # lint:ignore:quoted_booleans lint:ignore:double_quoted_strings reason
diff --git a/spec/puppet-lint/bin_spec.rb b/spec/puppet-lint/bin_spec.rb
index 9e70ee68..81c745e3 100644
--- a/spec/puppet-lint/bin_spec.rb
+++ b/spec/puppet-lint/bin_spec.rb
@@ -2,6 +2,8 @@
 require 'rspec/mocks'
 require 'optparse'
 
+invalid_code_error = "puppet-lint: the manifest code cannot be validated by `puppet parser validate`\npuppet-lint: try again once the code is valid"
+
 class CommandRun
   attr_accessor :stdout, :stderr, :exitstatus
 
@@ -71,7 +73,7 @@ def initialize(args)
     let(:args) { 'spec/fixtures/test/manifests/malformed.pp' }
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to eq('ERROR: Syntax error (try running `puppet parser validate <file>`) on line 1') }
+    its(:stdout) { is_expected.to eq(invalid_code_error) }
   end
 
   context 'when limited to errors only' do