summaryrefslogtreecommitdiffstats
path: root/spec/lib
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-04-13 00:17:57 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-04-13 00:17:57 -0700
commit4dd6a77481400b7eeac3377267d092d4c6d22da3 (patch)
treef95d292596144832805a9b57a55bc440f7cfaa43 /spec/lib
parent941c56a283265cdf5a951ecaae63580b60486c52 (diff)
downloadpuppet-4dd6a77481400b7eeac3377267d092d4c6d22da3.tar.gz
puppet-4dd6a77481400b7eeac3377267d092d4c6d22da3.tar.xz
puppet-4dd6a77481400b7eeac3377267d092d4c6d22da3.zip
(#7056) Use 'face' rather than 'faces' in the production code.
After some discussion we decided that most uses of the Puppet Face infrastructure were about single faces on their own, not about the collection, and so we were better referring to Puppet::Face[...] in code. This implements that by translating names and references in the Ruby code to the new, s-less, name.
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/puppet/face/basetest.rb1
-rw-r--r--spec/lib/puppet/face/huzzah.rb (renamed from spec/lib/puppet/faces/huzzah.rb)4
-rw-r--r--spec/lib/puppet/faces/basetest.rb1
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/puppet/face/basetest.rb b/spec/lib/puppet/face/basetest.rb
new file mode 100644
index 000000000..00616f74f
--- /dev/null
+++ b/spec/lib/puppet/face/basetest.rb
@@ -0,0 +1 @@
+Puppet::Face.define(:basetest, '0.0.1')
diff --git a/spec/lib/puppet/faces/huzzah.rb b/spec/lib/puppet/face/huzzah.rb
index e86730250..3428c6816 100644
--- a/spec/lib/puppet/faces/huzzah.rb
+++ b/spec/lib/puppet/face/huzzah.rb
@@ -1,5 +1,5 @@
-require 'puppet/faces'
-Puppet::Faces.define(:huzzah, '2.0.1') do
+require 'puppet/face'
+Puppet::Face.define(:huzzah, '2.0.1') do
summary "life is a thing for celebration"
action :bar do "is where beer comes from" end
end
diff --git a/spec/lib/puppet/faces/basetest.rb b/spec/lib/puppet/faces/basetest.rb
deleted file mode 100644
index d20c52b97..000000000
--- a/spec/lib/puppet/faces/basetest.rb
+++ /dev/null
@@ -1 +0,0 @@
-Puppet::Faces.define(:basetest, '0.0.1')