chef 10.12.0 → 10.14.0.beta.1

data/spec/unit/mixin/deprecation_spec.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/mixin/deprecation'
+
+describe Chef::Mixin::Deprecation::DeprecatedInstanceVariable do
+  before do
+    Chef::Log.logger = Logger.new(StringIO.new)
+
+    @deprecated_ivar = Chef::Mixin::Deprecation::DeprecatedInstanceVariable.new('value', 'an_ivar')
+  end
+
+  it "forward method calls to the target object" do
+    @deprecated_ivar.length.should == 5
+    @deprecated_ivar.to_sym.should == :value
+  end
+
+end

data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Mark Mzyk (<mmzyk@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Mixin::EnforceOwnershipAndPermissions do
+
+  before(:each) do
+    @node = Chef::Node.new
+    @node.name "make_believe"
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @resource = Chef::Resource::File.new("#{Dir.tmpdir}/madeup.txt")
+    @resource.owner "adam"
+    @provider = Chef::Provider::File.new(@resource, @run_context)
+    @provider.current_resource = @resource
+  end
+
+  it "should call set_all on the file access control object" do
+    Chef::FileAccessControl.any_instance.should_receive(:set_all)
+    @provider.enforce_ownership_and_permissions
+  end
+
+  context "when nothing was updated" do
+    before do
+      Chef::FileAccessControl.any_instance.stub(:uid_from_resource).and_return(0)
+      Chef::FileAccessControl.any_instance.stub(:requires_changes?).and_return(false)
+    end
+    it "does not set updated_by_last_action on the new resource" do
+      @provider.new_resource.should_not_receive(:updated_by_last_action)
+
+      Chef::FileAccessControl.any_instance.stub(:set_all)
+      @provider.run_action(:create)
+    end
+
+  end
+
+  context "when something was modified" do
+    before do
+      Chef::FileAccessControl.any_instance.stub(:requires_changes?).and_return(true)
+      Chef::FileAccessControl.any_instance.stub(:uid_from_resource).and_return(0)
+    end
+
+    it "sets updated_by_last_action on the new resource" do
+      @provider.new_resource.should_receive(:updated_by_last_action)
+      Chef::FileAccessControl.any_instance.stub(:set_all)
+      @provider.run_action(:create)
+    end
+  end
+
+end

data/spec/unit/mixin/language_spec.rb

@@ -0,0 +1,305 @@
+#
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/mixin/language'
+
+class LanguageTester
+  include Chef::Mixin::Language
+end
+
+describe Chef::Mixin::Language do
+  before(:each) do
+    @language = LanguageTester.new
+    @node = Hash.new
+    @language.stub!(:node).and_return(@node)
+    @platform_hash = {}
+    %w{openbsd freebsd}.each do |x|
+      @platform_hash[x] = {
+        "default" => x,
+        "1.2.3" => "#{x}-1.2.3"
+      }
+    end
+    @platform_hash["debian"] = {["5", "6"] => "debian-5/6", "default" => "debian"} 
+    @platform_hash["default"] = "default"
+
+    @platform_family_hash = { 
+      "debian" => "debian value", 
+      [:rhel, :fedora] => "redhatty value", 
+      "suse" => "suse value", 
+      :default => "default value"
+    }
+  end
+
+  it "returns a default value when there is no known platform" do
+    @node = Hash.new
+    @language.value_for_platform(@platform_hash).should == "default"
+  end
+
+  it "returns a default value when there is no known platform family" do 
+    @language.value_for_platform_family(@platform_family_hash).should == "default value" 
+  end
+	  
+  it "returns a default value when the current platform doesn't match" do
+    @node[:platform] = "not-a-known-platform"
+    @language.value_for_platform(@platform_hash).should == "default"
+  end
+
+  it "returns a default value when current platform_family doesn't match" do 
+    @node[:platform_family] = "ultra-derived-linux"
+    @language.value_for_platform_family(@platform_family_hash).should == "default value" 
+  end
+	  
+  it "returns a value based on the current platform" do
+    @node[:platform] = "openbsd"
+    @language.value_for_platform(@platform_hash).should == "openbsd"
+  end
+
+  it "returns a value based on the current platform family" do 
+    @node[:platform_family] = "debian"
+    @language.value_for_platform_family(@platform_family_hash).should == "debian value" 
+  end
+
+  it "returns a version-specific value based on the current platform" do
+    @node[:platform] = "openbsd"
+    @node[:platform_version] = "1.2.3"
+    @language.value_for_platform(@platform_hash).should == "openbsd-1.2.3"
+  end
+
+  it "returns a value based on the current platform if version not found" do
+    @node[:platform] = "openbsd"
+    @node[:platform_version] = "0.0.0"
+    @language.value_for_platform(@platform_hash).should == "openbsd"
+  end
+
+  describe "when platform versions is an array" do
+    it "returns a version-specific value based on the current platform" do
+      @node[:platform] = "debian"
+      @node[:platform_version] = "6"
+      @language.value_for_platform(@platform_hash).should == "debian-5/6"
+    end
+
+    it "returns a value based on the current platform if version not found" do
+      @node[:platform] = "debian"
+      @node[:platform_version] = "0.0.0"
+      @language.value_for_platform(@platform_hash).should == "debian"
+    end
+  end
+
+  describe "when checking platform?" do 
+    before(:each) do
+      @language = LanguageTester.new
+      @node = Hash.new
+      @language.stub!(:node).and_return(@node)
+    end
+    
+    it "returns true if the node is a provided platform and platforms are provided as symbols" do 
+      @node[:platform] = 'ubuntu'
+      @language.platform?([:redhat, :ubuntu]).should == true
+    end
+ 
+    it "returns true if the node is a provided platform and platforms are provided as strings" do 
+      @node[:platform] = 'ubuntu'
+      @language.platform?(["redhat", "ubuntu"]).should == true
+    end
+ 
+    it "returns false if the node is not of the provided platforms" do 
+      @node[:platform] = 'ubuntu'
+      @language.platform?(:splatlinux).should == false
+    end
+  end
+  
+  describe "when checking platform_family?" do 
+    before(:each) do
+      @language = LanguageTester.new
+      @node = Hash.new
+      @language.stub!(:node).and_return(@node)
+    end
+    
+    it "returns true if the node is in a provided platform family and families are provided as symbols" do 
+      @node[:platform_family] = 'debian'
+      @language.platform_family?([:rhel, :debian]).should == true
+    end
+ 
+    it "returns true if the node is a provided platform and platforms are provided as strings" do 
+      @node[:platform_family] = 'rhel'
+      @language.platform_family?(["rhel", "debian"]).should == true
+    end
+ 
+    it "returns false if the node is not of the provided platforms" do 
+      @node[:platform_family] = 'suse'
+      @language.platform_family?(:splatlinux).should == false
+    end
+  
+    it "returns false if the node is not of the provided platforms and platform_family is not set" do 
+      @language.platform_family?(:splatlinux).should == false
+    end
+
+  end
+  # NOTE: this is a regression test for bug CHEF-1514
+  describe "when the value is an array" do
+    before do
+      @platform_hash = {
+        "debian" => { "4.0" => [ :restart, :reload ], "default" => [ :restart, :reload, :status ] },
+        "ubuntu" => { "default" => [ :restart, :reload, :status ] },
+        "centos" => { "default" => [ :restart, :reload, :status ] },
+        "redhat" => { "default" => [ :restart, :reload, :status ] },
+        "fedora" => { "default" => [ :restart, :reload, :status ] },
+        "default" => { "default" => [:restart, :reload ] }}
+    end
+
+    it "returns the correct default for a given platform" do
+      @node[:platform] = "debian"
+      @node[:platform_version] = '9000'
+      @language.value_for_platform(@platform_hash).should == [ :restart, :reload, :status ]
+    end
+
+    it "returns the correct platform+version specific value " do
+      @node[:platform] = "debian"
+      @node[:platform_version] = '4.0'
+      @language.value_for_platform(@platform_hash).should == [:restart, :reload]
+    end 
+  end
+
+  describe "when loading data bags and items" do
+    it "lists the items in a data bag" do
+      Chef::DataBag.should_receive(:load).with("bag_name").and_return("item_1" => "http://url_for/item_1", "item_2" => "http://url_for/item_2")
+      @language.data_bag("bag_name").sort.should == %w[item_1 item_2]
+    end
+
+    it "validates the name of the data bag you're trying to load" do
+      lambda {@language.data_bag("!# %^&& ")}.should raise_error(Chef::Exceptions::InvalidDataBagName)
+    end
+
+    it "fetches a data bag item" do
+      @item = Chef::DataBagItem.new
+      @item.data_bag("bag_name")
+      @item.raw_data = {"id" => "item_name", "FUU" => "FUU"}
+      Chef::DataBagItem.should_receive(:load).with("bag_name", "item_name").and_return(@item)
+      @language.data_bag_item("bag_name", "item_name").should == @item
+    end
+
+    it "validates the name of the data bag you're trying to load an item from" do
+      lambda {@language.data_bag_item(" %%^& ", "item_name")}.should raise_error(Chef::Exceptions::InvalidDataBagName)
+    end
+
+    it "validates the id of the data bag item you're trying to load" do
+      lambda {@language.data_bag_item("bag_name", " 987 (*&()")}.should raise_error(Chef::Exceptions::InvalidDataBagItemID)
+    end
+
+    it "validates that the id of the data bag item is not nil" do
+      lambda {@language.data_bag_item("bag_name", nil)}.should raise_error(Chef::Exceptions::InvalidDataBagItemID)
+    end
+
+  end
+
+end
+
+describe Chef::Mixin::Language::PlatformDependentValue do
+  before do
+    platform_hash = {
+      :openbsd => {:default => 'free, functional, secure'},
+      [:redhat, :centos, :fedora, :scientific] => {:default => '"stable"'},
+      :ubuntu => {'10.04' => 'using upstart more', :default => 'using init more'},
+      :default => 'bork da bork'
+    }
+    @platform_specific_value = Chef::Mixin::Language::PlatformDependentValue.new(platform_hash)
+  end
+
+  it "returns the default value when the platform doesn't match" do
+    @platform_specific_value.value_for_node(:platform => :dos).should == 'bork da bork'
+  end
+
+  it "returns a value for a platform set as a group" do
+    @platform_specific_value.value_for_node(:platform => :centos).should == '"stable"'
+  end
+
+  it "returns a value for the platform when it was set as a symbol but fetched as a string" do
+    @platform_specific_value.value_for_node(:platform => "centos").should == '"stable"'
+  end
+
+  it "returns a value for a specific platform version" do
+    node = {:platform => 'ubuntu', :platform_version => '10.04'}
+    @platform_specific_value.value_for_node(node).should == 'using upstart more'
+  end
+
+  it "returns a platform-default value if the platform version doesn't match an explicit one" do
+    node = {:platform => 'ubuntu', :platform_version => '9.10' }
+    @platform_specific_value.value_for_node(node).should == 'using init more'
+  end
+
+  it "returns nil if there is no default and no platforms match" do
+    # this matches the behavior in the original implementation.
+    # whether or not it's correct is another matter.
+    platform_specific_value = Chef::Mixin::Language::PlatformDependentValue.new({})
+    platform_specific_value.value_for_node(:platform => 'foo').should be_nil
+  end
+
+  it "raises an argument error if the platform hash is not correctly structured" do
+    bad_hash = {:ubuntu => :foo} # should be :ubuntu => {:default => 'foo'}
+    lambda {Chef::Mixin::Language::PlatformDependentValue.new(bad_hash)}.should raise_error(ArgumentError)
+  end
+
+end
+describe Chef::Mixin::Language::PlatformFamilyDependentValue do
+  before do
+    @array_values = [:stop, :start, :reload] 
+
+    @platform_family_hash = { 
+      "debian" => "debian value", 
+      [:rhel, "fedora"] => "redhatty value", 
+      "suse" => @array_values, 
+      :gentoo => "gentoo value",
+      :default => "default value"
+    }
+      
+    @platform_family_value = Chef::Mixin::Language::PlatformFamilyDependentValue.new(@platform_family_hash)
+  end
+
+  it "returns the default value when the platform family doesn't match" do
+    @platform_family_value.value_for_node(:platform_family => :os2).should == 'default value'
+  end
+
+
+  it "returns a value for the platform family when it was set as a string but fetched as a symbol" do
+    @platform_family_value.value_for_node(:platform_family => :debian).should == "debian value" 
+  end
+  
+  
+  it "returns a value for the platform family when it was set as a symbol but fetched as a string" do
+    @platform_family_value.value_for_node(:platform_family => "gentoo").should == "gentoo value" 
+  end
+ 
+  it "returns an array value stored for a platform family" do 
+    @platform_family_value.value_for_node(:platform_family => "suse").should == @array_values
+  end
+
+  it "returns a value for the platform family when it was set within an array hash key as a symbol" do
+    @platform_family_value.value_for_node(:platform_family => :rhel).should == "redhatty value" 
+  end
+  
+  it "returns a value for the platform family when it was set within an array hash key as a string" do
+    @platform_family_value.value_for_node(:platform_family => "fedora").should == "redhatty value" 
+  end
+  
+  it "returns nil if there is no default and no platforms match" do
+    platform_specific_value = Chef::Mixin::Language::PlatformFamilyDependentValue.new({})
+    platform_specific_value.value_for_node(:platform_family => 'foo').should be_nil
+  end
+
+end

data/spec/unit/mixin/params_validate_spec.rb

@@ -0,0 +1,370 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+class TinyClass
+  include Chef::Mixin::ParamsValidate
+  
+  def music(is_good=true)
+    is_good
+  end
+end
+
+describe Chef::Mixin::ParamsValidate do
+  before(:each) do
+     @vo = TinyClass.new()
+  end
+  
+  it "should allow a hash and a hash as arguments to validate" do
+    lambda { @vo.validate({:one => "two"}, {}) }.should_not raise_error(ArgumentError)
+  end
+  
+  it "should raise an argument error if validate is called incorrectly" do
+    lambda { @vo.validate("one", "two") }.should raise_error(ArgumentError)
+  end
+  
+  it "should require validation map keys to be symbols or strings" do
+    lambda { @vo.validate({:one => "two"}, { :one => true }) }.should_not raise_error(ArgumentError)
+    lambda { @vo.validate({:one => "two"}, { "one" => true }) }.should_not raise_error(ArgumentError)
+    lambda { @vo.validate({:one => "two"}, { Hash.new => true }) }.should raise_error(ArgumentError)
+  end
+  
+  it "should allow options to be required with true" do
+    lambda { @vo.validate({:one => "two"}, { :one => true }) }.should_not raise_error(ArgumentError)
+  end
+  
+  it "should allow options to be optional with false" do
+    lambda { @vo.validate({}, {:one => false})}.should_not raise_error(ArgumentError)
+  end    
+  
+  it "should allow you to check what kind_of? thing an argument is with kind_of" do
+    lambda { 
+      @vo.validate(
+        {:one => "string"}, 
+        {
+          :one => {
+            :kind_of => String
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        {:one => "string"}, 
+        {
+          :one => {
+            :kind_of => Array
+          }
+        }
+      ) 
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should allow you to specify an argument is required with required" do
+    lambda { 
+      @vo.validate(
+        {:one => "string"}, 
+        {
+          :one => {
+            :required => true
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        {:two => "string"}, 
+        {
+          :one => {
+            :required => true
+          }
+        }
+      ) 
+    }.should raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        {:two => "string"}, 
+        {
+          :one => {
+            :required => false
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+  end
+  
+  it "should allow you to specify whether an object has a method with respond_to" do
+    lambda { 
+      @vo.validate(
+        {:one => @vo}, 
+        {
+          :one => {
+            :respond_to => "validate"
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        {:one => @vo}, 
+        {
+          :one => {
+            :respond_to => "monkey"
+          }
+        }
+      ) 
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should allow you to specify whether an object has all the given methods with respond_to and an array" do
+    lambda { 
+      @vo.validate(
+        {:one => @vo}, 
+        {
+          :one => {
+            :respond_to => ["validate", "music"]
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        {:one => @vo}, 
+        {
+          :one => {
+            :respond_to => ["monkey", "validate"]
+          }
+        }
+      ) 
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should let you set a default value with default => value" do
+    arguments = Hash.new
+    @vo.validate(arguments, {
+      :one => {
+        :default => "is the loneliest number"
+      }
+    })
+    arguments[:one].should == "is the loneliest number"
+  end
+  
+  it "should let you check regular expressions" do
+    lambda { 
+      @vo.validate(
+        { :one => "is good" },
+        {
+          :one => {
+            :regex => /^is good$/
+          }
+        }
+      )
+    }.should_not raise_error(ArgumentError)
+    
+    lambda { 
+      @vo.validate(
+        { :one => "is good" },
+        {
+          :one => {
+            :regex => /^is bad$/
+          }
+        }
+      )
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should let you specify your own callbacks" do
+    lambda { 
+      @vo.validate(
+        { :one => "is good" },
+        {
+          :one => {
+            :callbacks => {
+              "should be equal to is good" => lambda { |a|
+                a == "is good"
+              },
+            }
+          }
+        }
+      )
+    }.should_not raise_error(ArgumentError) 
+    
+    lambda { 
+      @vo.validate(
+        { :one => "is bad" },
+        {
+          :one => {
+            :callbacks => {
+              "should be equal to 'is good'" => lambda { |a|
+                a == "is good"
+              },
+            }
+          }
+        }
+      )
+    }.should raise_error(ArgumentError)   
+  end
+  
+  it "should let you combine checks" do
+    args = { :one => "is good", :two => "is bad" }
+    lambda { 
+      @vo.validate(
+        args,
+        {
+          :one => {
+            :kind_of => String,
+            :respond_to => [ :to_s, :upcase ],
+            :regex => /^is good/,
+            :callbacks => {
+              "should be your friend" => lambda { |a|
+                a == "is good"
+              }
+            },
+            :required => true
+          },
+          :two => {
+            :kind_of => String,
+            :required => false
+          },
+          :three => { :default => "neato mosquito" }
+        }
+      )
+    }.should_not raise_error(ArgumentError)
+    args[:three].should == "neato mosquito"
+    lambda {
+      @vo.validate(
+        args,
+        {
+          :one => {
+            :kind_of => String,
+            :respond_to => [ :to_s, :upcase ],
+            :regex => /^is good/,
+            :callbacks => {
+              "should be your friend" => lambda { |a|
+                a == "is good"
+              }
+            },
+            :required => true
+          },
+          :two => {
+            :kind_of => Hash,
+            :required => false
+          },
+          :three => { :default => "neato mosquito" }
+        }
+      )
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should raise an ArgumentError if the validation map has an unknown check" do
+    lambda { @vo.validate(
+        { :one => "two" },
+        {
+          :one => {
+            :busted => "check"
+          }
+        }
+      )
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should accept keys that are strings in the options" do
+    lambda {
+      @vo.validate({ "one" => "two" }, { :one => { :regex => /^two$/ }}) 
+    }.should_not raise_error(ArgumentError)
+  end
+  
+  it "should allow an array to kind_of" do
+    lambda { 
+      @vo.validate(
+        {:one => "string"}, 
+        {
+          :one => {
+            :kind_of => [ String, Array ]
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    lambda { 
+      @vo.validate(
+        {:one => ["string"]}, 
+        {
+          :one => {
+            :kind_of => [ String, Array ]
+          }
+        }
+      ) 
+    }.should_not raise_error(ArgumentError)
+    lambda { 
+      @vo.validate(
+        {:one => Hash.new}, 
+        {
+          :one => {
+            :kind_of => [ String, Array ]
+          }
+        }
+      ) 
+    }.should raise_error(ArgumentError)
+  end
+
+  it "asserts that a value returns false from a predicate method" do
+    lambda do
+      @vo.validate({:not_blank => "should pass"}, {:not_blank => {:cannot_be => :blank}})
+    end.should_not raise_error
+    lambda do
+      @vo.validate({:not_blank => ""}, {:not_blank => {:cannot_be => :blank}})
+    end.should raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "should set and return a value, then return the same value" do
+    value = "meow"
+    @vo.set_or_return(:test, value, {}).object_id.should == value.object_id
+    @vo.set_or_return(:test, nil, {}).object_id.should == value.object_id
+  end
+
+  it "should set and return a default value when the argument is nil, then return the same value" do
+    value = "meow"
+    @vo.set_or_return(:test, nil, { :default => value }).object_id.should == value.object_id
+    @vo.set_or_return(:test, nil, {}).object_id.should == value.object_id
+  end
+
+  it "should raise an ArgumentError when argument is nil and required is true" do
+    lambda {
+      @vo.set_or_return(:test, nil, { :required => true })
+    }.should raise_error(ArgumentError)
+  end
+
+  it "should not raise an error when argument is nil and required is false" do
+    lambda {
+      @vo.set_or_return(:test, nil, { :required => false })
+    }.should_not raise_error(ArgumentError)
+  end
+
+  it "should set and return @name, then return @name for foo when argument is nil" do
+    value = "meow"
+    @vo.set_or_return(:name, value, { }).object_id.should == value.object_id
+    @vo.set_or_return(:foo, nil, { :name_attribute => true }).object_id.should == value.object_id
+  end
+  
+end