3 files changed, 29 insertions, 29 deletions
diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb
index 245cd3aff8..a94b248418 100644
--- a/spec/unit/provider/package/apt_spec.rb
+++ b/spec/unit/provider/package/apt_spec.rb
@@ -24,7 +24,7 @@ describe Chef::Provider::Package::Apt do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::AptPackage.new("irssi", @run_context)
+    @new_resource = Chef::Resource::Package.new("irssi", @run_context)
 
     @status = double("Status", :exitstatus => 0)
     @provider = Chef::Provider::Package::Apt.new(@new_resource, @run_context)
@@ -52,7 +52,7 @@ PKG_STATUS
       @provider.load_current_resource
 
       current_resource = @provider.current_resource
-      current_resource.should be_a(Chef::Resource::AptPackage)
+      current_resource.should be_a(Chef::Resource::Package)
       current_resource.name.should == "irssi"
       current_resource.package_name.should == "irssi"
       current_resource.version.should be_nil
@@ -201,7 +201,7 @@ SHOWPKG_STDOUT
 
   context "after loading the current resource" do
     before do
-      @current_resource = Chef::Resource::AptPackage.new("irssi", @run_context)
+      @current_resource = Chef::Resource::Package.new("irssi", @run_context)
       @provider.current_resource = @current_resource
     end
 
diff --git a/spec/unit/resource/apt_package_spec.rb b/spec/unit/resource/apt_package_spec.rb
index 81df04c59f..58b007c327 100644
--- a/spec/unit/resource/apt_package_spec.rb
+++ b/spec/unit/resource/apt_package_spec.rb
@@ -40,12 +40,4 @@ describe Chef::Resource::AptPackage, "initialize" do
     @resource.default_release("lenny-backports")
     @resource.default_release.should eql("lenny-backports")
   end
-
-  # String, Integer
-  [ "600", 600 ].each do |val|
-    it "supports setting a timeout as a #{val.class}" do
-      @resource.timeout(val)
-      expect(@resource.timeout).to eql(val)
-    end
-  end
 end
diff --git a/spec/unit/resource/package_spec.rb b/spec/unit/resource/package_spec.rb
index 2884c94393..8a1a13394e 100644
--- a/spec/unit/resource/package_spec.rb
+++ b/spec/unit/resource/package_spec.rb
@@ -64,22 +64,30 @@ describe Chef::Resource::Package do
     @resource.options.should eql("something")
   end
 
- describe "when it has a package_name and version" do
-   before do
-     @resource.package_name("tomcat")
-     @resource.version("10.9.8")
-     @resource.options("-al")
-   end
-
-   it "describes its state" do
-     state = @resource.state
-     state[:version].should == "10.9.8"
-     state[:options].should == "-al"
-   end
-
-   it "returns the file path as its identity" do
-     @resource.identity.should == "tomcat"
-   end
-
- end
+  describe "when it has a package_name and version" do
+    before do
+      @resource.package_name("tomcat")
+      @resource.version("10.9.8")
+      @resource.options("-al")
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:version].should == "10.9.8"
+      state[:options].should == "-al"
+    end
+
+    it "returns the file path as its identity" do
+      @resource.identity.should == "tomcat"
+    end
+  end
+
+  # String, Integer
+  [ "600", 600 ].each do |val|
+    it "supports setting a timeout as a #{val.class}" do
+      @resource.timeout(val)
+      expect(@resource.timeout).to eql(val)
+    end
+  end
+
 end