rspec-puppet-utils 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: a793bb20839f6196c2ce603dcc9b8c8841b6531edf46b3ad30e06f7abd23606a9fd64928e454e5d2b7bc0badf94fd7aef662d6c75473d8278fdb51c3c4c0bc10
-  data.tar.gz: 8bae6014ffb663d0710e978defebed9f756d93e541265aace4e0fc225cc20b3d45cbbbbe42d5d9533d0b677f38347dd5ae5a1085c7895379b841cbc32e2155d8
 SHA1: 
-  metadata.gz: 0e9fcf15482e816c286f0cbea058e43c7e704427
-  data.tar.gz: 7de926971e6a20fa05e1b6a89a7e09c64affced2
+  metadata.gz: dade7bb417a5a0a9d0729271ec800230452f8193
+  data.tar.gz: db8ed24e66fb1ccd37b6e3d176cc2c0bd6865ce5
+SHA512: 
+  metadata.gz: 33be8cf25d66aeeffd71ab9ffcbebd275c97d47511844577457c4e77fbeec59f83f9d7f45d008c39a4915c1c6391069a693f711d3a28a2ef3de8f9de282fb002
+  data.tar.gz: 29869351c54ecfacfefe580b1d2f29c645d537c0ff617437fb227cea172b0fc18cfe6a8ca0f9567bb92391e2a3d63280969093a9c0d2ba8e7a04bb2383562069

data/README.md

@@ -47,14 +47,14 @@ If you use let, **use `let!()` and not `let()`**, this is because lets are lazy-
 
 Also if you use `let` when mocking hiera, **you can't use `:hiera` as the name due to conflicts** so you have to do something like `let!(:mock_hiera) { MockFunction.new('hiera') }`
 
-Mocha stubs and expects:
+#####Mocha stubs and expects:
 `f.stub` and `f.expect` are helper methods for `f.stubs(:call)` and `f.expects(:call)`
 
-Internally `#expect` will clear the rspec-puppet catalog cache. This is because rspec-puppet will only re-compile the catalog for a test if the title, params, facts, or code is changed. This means that functions are only called when these are changed, so if you setup an expectaion in a test, it might not be satisfied because the catalog was already compiled for a previous test.
+Internally `#expect` will clear the rspec-puppet catalog cache. This is because rspec-puppet will only re-compile the catalog for a test if `:title`, `:params`, or `:facts` are changed. This means that if you setup an expectaion in a test, it might not be satisfied because the catalog was already compiled for a previous test, and so the functions weren't called!
 
-Clearing the cache ensures tests aren't coupled and order dependent. The downside is that the catalog isn't cached and has to be re-compiled which slows down the tests. So if you're concerned about performance and you are explicitly changing the title or params (or facts or code) for a test you can keep the cache intact with `f.expect(:keep_cache)`
+Clearing the cache ensures tests aren't coupled and order dependent. The downside is that the catalog isn't cached and has to be re-compiled which slows down your tests. If you're concerned about performance and you are explicitly changing `:title`, `:params`, or `:facts` for a test, you can keep the cache intact with `f.expect(:keep_cache)`
 
-Notes:
+#####Notes:
 - You always stub the `call` method as that gets called internally
 - The `call` method takes an array of arguments
 

data/lib/template_harness.rb

@@ -16,8 +16,11 @@ module RSpecPuppetUtils
 
     def run
       b = @isolator.get_binding
-      template = File.exists?(@template) ? File.new(@template).read : @template
-      ERB.new(template, 0, '-').result b
+      inline = !File.exists?(@template)
+      template_string = inline ? @template : File.new(@template).read
+      template = ERB.new(template_string, 0, '-')
+      template.filename = File.expand_path(@template) unless inline
+      template.result b
     end
 
     class Isolator

data/rspec-puppet-utils.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = 'rspec-puppet-utils'
-  gem.version       = '2.0.3'
+  gem.version       = '2.0.4'
   gem.description   = 'Helper classes for mock/stub functions, templates and hierdata'
   gem.summary       = ''
   gem.author        = 'Tom Poulton'

data/spec/classes/template_harness_spec.rb

@@ -45,4 +45,25 @@ describe TemplateHarness do
     expect(harness.run).to eq 'elephant'
   end
 
+  it 'should set filename of template' do
+    template_path = 'spec/fixtures/templates/returns_elephant.erb'
+    absolute_path = File.expand_path(template_path)
+
+    fakeplate = Object.new
+    fakeplate.stubs(:result).returns('')
+    fakeplate.expects(:filename=).with(absolute_path).once
+    ERB.stubs(:new).returns(fakeplate)
+
+    TemplateHarness.new(template_path).run
+  end
+
+  it 'should not set filename of inline template' do
+    fakeplate = Object.new
+    fakeplate.stubs(:result).returns('')
+    fakeplate.expects(:filename=).never
+    ERB.stubs(:new).returns(fakeplate)
+
+    TemplateHarness.new('<%= "" %>').run
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet-utils
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-17 00:00:00 Z
+date: 2014-07-02 00:00:00 Z
 dependencies: []
 
 description: Helper classes for mock/stub functions, templates and hierdata