test_helper.rb in ripple-1.0.0.beta2

- old
+ new

@@ -7,17 +7,18 @@
         orig_hooks = Riak::RObject.on_conflict_hooks.dup
         Riak::RObject.on_conflict_hooks.clear
 
         begin
           klass, key = main_record.class, main_record.key
+          raise "#{klass.bucket.name} allow_mult property is false!" unless klass.bucket.allow_mult
           records = modifiers.map { |_| klass.find!(key) }
 
           records.zip(modifiers).each do |(record, modifier)|
-            # necessary to get conflict, so riak thinks they are being saved by different clients
+            # necessary to get conflict on 0.14 and earlier, so riak thinks they are being saved by different clients
             Ripple.client.client_id += 1
 
             modifier.call(record)
-            record.save!
+            record.save! unless record.deleted?
           end
 
           robject = klass.bucket.get(key)
           raise "#{robject} is not in conflict as expected." unless robject.conflict?
         ensure