Permalink
Browse files

Fix test

Accidentally checked in commented test code. Fail. >_<
  • Loading branch information...
jonleighton committed Sep 14, 2012
1 parent 02f5655 commit 60c88e64e26682a954f7c8cd6669d409ffffcc8b
@@ -35,17 +35,27 @@ def add_record(record)
end
class OpenTransaction < Transaction #:nodoc:
- attr_reader :parent, :records
- attr_accessor :joinable
-
- alias joinable? joinable
+ attr_reader :parent, :records
+ attr_writer :joinable
def initialize(connection, parent)
super connection
@parent = parent
@records = []
@finishing = false
+ @joinable = true
+ end
+
+ # This state is necesarry so that we correctly handle stuff that might
+ # happen in a commit/rollback. But it's kinda distasteful. Maybe we can
+ # find a better way to structure it in the future.
+ def finishing?
+ @finishing
+ end
+
+ def joinable?
+ @joinable && !finishing?
end
def number
@@ -56,16 +66,12 @@ def number
end
end
- # Database adapters expect that #open_transactions will be decremented
- # before we've actually executed a COMMIT or ROLLBACK. This is kinda
- # annoying, but for now we use this @finishing flag to toggle what value
- # #number should return.
- def finishing?
- @finishing
- end
-
def begin
- SavepointTransaction.new(connection, self)
+ if finishing?
+ parent.begin
+ else
+ SavepointTransaction.new(connection, self)
+ end
end
def rollback
@@ -354,7 +354,7 @@ def cache_topic
def test_after_commit_in_save
topic = TopicWithSaveInCallback.new()
topic.save
- # assert_equal true, topic.cached
- # assert_equal true, topic.record_updated
+ assert_equal true, topic.cached
+ assert_equal true, topic.record_updated
end
end

0 comments on commit 60c88e6

Please sign in to comment.