From 4609e203fd47f8159118bb74a8308f9c6aee179f Mon Sep 17 00:00:00 2001 From: Pieter van de Bruggen Date: Fri, 25 Mar 2011 14:52:48 -0700 Subject: (#6770) Change versioning; adopt :current over :latest. As per discussion with Luke, versions of an interface are first looked up by requiring 'puppet/interface/{name}', and secondarily looked up by requiring '{name}@{version}/puppet/interface/{name}' if the first failed. A version of `:current` can be used to represent the version living in 'puppet/interface/{name}'. Paired-With: Nick Lewis --- spec/unit/application/string_base_spec.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'spec/unit/application/string_base_spec.rb') diff --git a/spec/unit/application/string_base_spec.rb b/spec/unit/application/string_base_spec.rb index bc563e11d..86f9c09aa 100755 --- a/spec/unit/application/string_base_spec.rb +++ b/spec/unit/application/string_base_spec.rb @@ -2,13 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb') require 'puppet/application/string_base' +require 'tmpdir' + +class Puppet::Application::StringBase::Basetest < Puppet::Application::StringBase +end describe Puppet::Application::StringBase do before :all do @dir = Dir.mktmpdir $LOAD_PATH.push(@dir) - FileUtils.mkdir_p(File.join @dir, 'puppet', 'string', 'v0.0.1') - FileUtils.touch(File.join @dir, 'puppet', 'string', 'v0.0.1', 'basetest.rb') + FileUtils.mkdir_p(File.join @dir, 'puppet', 'string') + File.open(File.join(@dir, 'puppet', 'string', 'basetest.rb'), 'w') do |f| + f.puts "Puppet::String.define(:basetest, '0.0.1')" + end end after :all do @@ -16,13 +22,8 @@ describe Puppet::Application::StringBase do $LOAD_PATH.pop end - base_string = Puppet::String.define(:basetest, '0.0.1') - class Puppet::Application::StringBase::Basetest < Puppet::Application::StringBase - end - before do @app = Puppet::Application::StringBase::Basetest.new - @app.stubs(:string).returns base_string @app.stubs(:exit) @app.stubs(:puts) Puppet::Util::Log.stubs(:newdestination) -- cgit