[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Nick Lewis]

The following commit has been merged in the experimental branch:
commit 5a9035551d730c1121a2a6634f4b591d404f8aa1
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Tue Mar 29 13:49:00 2011 -0700

    maint: Use bracket notation instead of define in specs
    
    The intent of these specs is to find the String rather than to actually define
    it. Thus, the bracket notation is more semantically accurate than using
    Puppet::String#define.
    
    Reviewed-By: Pieter van de Bruggen

diff --git a/spec/unit/application/certificate.rb b/spec/unit/application/certificate_spec.rb
similarity index 100%
rename from spec/unit/application/certificate.rb
rename to spec/unit/application/certificate_spec.rb
diff --git a/spec/unit/string/catalog_spec.rb b/spec/unit/string/catalog_spec.rb
index a11d29a..70dadd5 100755
--- a/spec/unit/string/catalog_spec.rb
+++ b/spec/unit/string/catalog_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:catalog, '0.0.1') do
+describe Puppet::String[:catalog, '0.0.1'] do
 end
diff --git a/spec/unit/string/certificate_request_spec.rb b/spec/unit/string/certificate_request_spec.rb
index 96e1d88..d0a8288 100755
--- a/spec/unit/string/certificate_request_spec.rb
+++ b/spec/unit/string/certificate_request_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:certificate_request, '0.0.1') do
+describe Puppet::String[:certificate_request, '0.0.1'] do
 end
diff --git a/spec/unit/string/certificate_revocation_list_spec.rb b/spec/unit/string/certificate_revocation_list_spec.rb
index cf50471..9168fb8 100755
--- a/spec/unit/string/certificate_revocation_list_spec.rb
+++ b/spec/unit/string/certificate_revocation_list_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:certificate_revocation_list, '0.0.1') do
+describe Puppet::String[:certificate_revocation_list, '0.0.1'] do
 end
diff --git a/spec/unit/string/certificate_spec.rb b/spec/unit/string/certificate_spec.rb
index 719ee6b..f6d5368 100755
--- a/spec/unit/string/certificate_spec.rb
+++ b/spec/unit/string/certificate_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:certificate, '0.0.1') do
+describe Puppet::String[:certificate, '0.0.1'] do
 end
diff --git a/spec/unit/string/config_spec.rb b/spec/unit/string/config_spec.rb
index 5622652..9919fef 100755
--- a/spec/unit/string/config_spec.rb
+++ b/spec/unit/string/config_spec.rb
@@ -2,7 +2,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:config, '0.0.1') do
+describe Puppet::String[:config, '0.0.1'] do
   it "should use Settings#print_config_options when asked to print" do
     Puppet.settings.stubs(:puts)
     Puppet.settings.expects(:print_config_options)
diff --git a/spec/unit/string/configurer_spec.rb b/spec/unit/string/configurer_spec.rb
index 400bfb5..1b428ef 100755
--- a/spec/unit/string/configurer_spec.rb
+++ b/spec/unit/string/configurer_spec.rb
@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 require 'puppet/indirector/catalog/rest'
 require 'tempfile'
 
-describe Puppet::String.define(:configurer, '0.0.1') do
+describe Puppet::String[:configurer, '0.0.1'] do
   describe "#synchronize" do
     it "should retrieve and apply a catalog and return a report" do
       dirname = Dir.mktmpdir("puppetdir")
diff --git a/spec/unit/string/facts_spec.rb b/spec/unit/string/facts_spec.rb
index a537b74..9b70247 100755
--- a/spec/unit/string/facts_spec.rb
+++ b/spec/unit/string/facts_spec.rb
@@ -2,7 +2,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:facts, '0.0.1') do
+describe Puppet::String[:facts, '0.0.1'] do
   it "should define an 'upload' fact" do
     subject.should be_action(:upload)
   end
diff --git a/spec/unit/string/file_spec.rb b/spec/unit/string/file_spec.rb
index bbc8c7e..f1b9302 100755
--- a/spec/unit/string/file_spec.rb
+++ b/spec/unit/string/file_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:file, '0.0.1') do
+describe Puppet::String[:file, '0.0.1'] do
 end
diff --git a/spec/unit/string/key_spec.rb b/spec/unit/string/key_spec.rb
index d77f02e..fe3532d 100755
--- a/spec/unit/string/key_spec.rb
+++ b/spec/unit/string/key_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:key, '0.0.1') do
+describe Puppet::String[:key, '0.0.1'] do
 end
diff --git a/spec/unit/string/node_spec.rb b/spec/unit/string/node_spec.rb
index 7198efe..520cc0f 100755
--- a/spec/unit/string/node_spec.rb
+++ b/spec/unit/string/node_spec.rb
@@ -2,7 +2,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:node, '0.0.1') do
+describe Puppet::String[:node, '0.0.1'] do
   it "should set its default format to :yaml" do
     subject.default_format.should == :yaml
   end
diff --git a/spec/unit/string/report_spec.rb b/spec/unit/string/report_spec.rb
index 51342c2..2e206dd 100755
--- a/spec/unit/string/report_spec.rb
+++ b/spec/unit/string/report_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:report, '0.0.1') do
+describe Puppet::String[:report, '0.0.1'] do
 end
diff --git a/spec/unit/string/resource_spec.rb b/spec/unit/string/resource_spec.rb
index de7e747..f4e6186 100755
--- a/spec/unit/string/resource_spec.rb
+++ b/spec/unit/string/resource_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:resource, '0.0.1') do
+describe Puppet::String[:resource, '0.0.1'] do
 end
diff --git a/spec/unit/string/resource_type_spec.rb b/spec/unit/string/resource_type_spec.rb
index 8b0b4aa..d12ec00 100755
--- a/spec/unit/string/resource_type_spec.rb
+++ b/spec/unit/string/resource_type_spec.rb
@@ -2,5 +2,5 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-describe Puppet::String.define(:resource_type, '0.0.1') do
+describe Puppet::String[:resource_type, '0.0.1'] do
 end

-- 
Puppet packaging for Debian