spec/uploader/versions_spec.rb in carrierwave-0.2.3 vs spec/uploader/versions_spec.rb in carrierwave-0.2.4

@@ -204,16 +204,13 @@
         @thumb_stored_file = mock('a thumb version of a stored file')
 
         @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
         @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
 
-        @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
-        @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
+        @base_stored_file.stub!(:delete)
+        @thumb_stored_file.stub!(:delete)
 
-        @uploader_class.storage.stub!(:destroy!)
-        @uploader_class.version(:thumb).storage.stub!(:destroy!)
-
         @uploader.store!(@file)
       end
 
       after do
         CarrierWave.config[:use_cache] = true
@@ -229,12 +226,12 @@
         @uploader.remove!
         @uploader.url.should be_nil
         @uploader.thumb.url.should be_nil
       end
 
-      it "should instruct the storage engine to remove the file and its versions" do
-        @uploader_class.storage.should_receive(:destroy!).with(@uploader, @uploader.file)
-        @uploader_class.version(:thumb).storage.should_receive(:destroy!).with(@uploader.thumb, @uploader.thumb.file)
+      it "should delete all the files" do
+        @base_stored_file.should_receive(:delete)
+        @thumb_stored_file.should_receive(:delete)
         @uploader.remove!
       end
 
     end
 
\ No newline at end of file