rubyrep 1.0.9 → 1.1.0

data/spec/configuration_spec.rb

@@ -60,6 +60,7 @@ describe Configuration do
     config = Configuration.new
     config.options_for_table('b').should == \
       Syncers::TwoWaySyncer.default_options.clone.
+      merge(Replicators::TwoWayReplicator.default_options.clone).
       merge(config.options)
   end
 
@@ -124,6 +125,7 @@ describe Configuration do
     config.include_tables(/a/, {:bla => :blub})
     config.options_for_table('b').should == \
       Syncers::TwoWaySyncer.default_options.clone.
+      merge(Replicators::TwoWayReplicator.default_options.clone).
       merge(config.options)
   end
 
@@ -132,6 +134,7 @@ describe Configuration do
     config.include_tables(/a/, {:bla => :blub})
     config.options_for_table('a').should == \
       Syncers::TwoWaySyncer.default_options.clone.
+      merge(Replicators::TwoWayReplicator.default_options.clone).
       merge(config.options).
       merge(:bla => :blub)
   end
@@ -144,6 +147,7 @@ describe Configuration do
     config.include_tables('y', {:bla => :foo})
     config.options_for_table('a').should == \
       Syncers::TwoWaySyncer.default_options.clone.
+      merge(Replicators::TwoWayReplicator.default_options.clone).
       merge(config.options).
       merge(:bla => :blok)
   end
@@ -172,6 +176,7 @@ describe Configuration do
     config.add_table_options(/a/, {:foo => :bar})
     config.options_for_table('a').should == \
       Syncers::TwoWaySyncer.default_options.clone.
+      merge(Replicators::TwoWayReplicator.default_options.clone).
       merge(config.options).
       merge(:bla => :blub, :foo => :bar)
   end

data/spec/connection_extender_interface_spec.rb

@@ -55,7 +55,7 @@ describe "ConnectionExtender", :shared => true do
     result = session.left.select_cursor(:table => 'scanner_records', :row_buffer_size => 2)
     result.next_row
     result.next_row
-    result.next_row['id'].should == '3'
+    result.next_row['id'].should == 3
     result.clear
   end
 
@@ -63,7 +63,7 @@ describe "ConnectionExtender", :shared => true do
     session = Session.new
     result = session.left.select_cursor :table => 'extender_one_record'
     result.next?.should be_true
-    result.next_row.should == {'id' => "1", 'name' => 'Alice'}
+    result.next_row.should == {'id' => 1, 'name' => 'Alice'}
   end
   
   it "select_cursor next_row should raise if there are no records" do
@@ -74,21 +74,16 @@ describe "ConnectionExtender", :shared => true do
   
   it "select_cursor next_row should handle multi byte characters correctly" do
     session = Session.new
-    result = session.left.select_cursor :query => "select id, multi_byte from extender_type_check"
-    row = result.next_row
-    row.should == {
-      'id' => "1", 
-      'multi_byte' => "よろしくお願(ねが)いします yoroshiku onegai shimasu: I humbly ask for your favor."
-    }
+    result = session.left.select_record(:table => "extender_type_check")['multi_byte'].
+      should == "よろしくお願(ねが)いします yoroshiku onegai shimasu: I humbly ask for your favor."
   end
   
   it "select_cursor should read null values correctly" do
     session = Session.new
-    result = session.left.select_cursor(
+    result = session.left.select_record(
       :table => 'extender_combined_key',
-      :row_keys => [{'first_id' => 3, 'second_id' => 1}]
-    )
-    result.next_row.should == {'first_id' => '3', 'second_id' => '1', 'name' => nil}
+      :row_keys => ['first_id' => 3, 'second_id' => 1]
+    ).should == {'first_id' => 3, 'second_id' => 1, 'name' => nil}
   end
 
   it "should read and write binary data correctly" do
@@ -99,17 +94,16 @@ describe "ConnectionExtender", :shared => true do
     begin
       session.left.begin_db_transaction
       session.left.insert_record('extender_type_check', {'id' => 6, 'binary_test' => org_data})
-      
+
       row = session.left.select_one(
         'select md5(binary_test) as md5 from extender_type_check where id = 6'
       )
       row['md5'].should == Digest::MD5.hexdigest(org_data)
 
-      cursor = session.left.select_cursor(
-        :query => "select id, binary_test from extender_type_check where id = 6"
-      )
-      cursor = TypeCastingCursor.new session.left, 'extender_type_check', cursor
-      result_data = cursor.next_row['binary_test']
+      result_data = session.left.select_record(
+        :table => "extender_type_check",
+        :row_keys => ["id" => 6]
+      )['binary_test']
       Digest::MD5.hexdigest(result_data).should == Digest::MD5.hexdigest(org_data)
     ensure
       session.left.rollback_db_transaction
@@ -127,9 +121,10 @@ describe "ConnectionExtender", :shared => true do
       sql = "insert into extender_type_check(id, text_test) values(2, '#{org_data}')"
       session.left.execute sql
 
-      org_cursor = session.left.select_cursor(:query => "select id, text_test from extender_type_check where id = 2")
-      cursor = TypeCastingCursor.new session.left, 'extender_type_check', org_cursor
-      result_data = cursor.next_row['text_test']
+      result_data = session.left.select_record(
+        :table => "extender_type_check",
+        :row_keys => ["id" => 2]
+      )["text_test"]
     ensure
       session.left.rollback_db_transaction
     end

data/spec/db_specific_connection_extenders_spec.rb

@@ -6,7 +6,7 @@ include RR
 extenders = [:mysql, :postgres]
 
 extenders.each do |extender|
-  describe "#{extender.to_s.capitalize} Replication Extender" do
+  describe "#{extender.to_s.capitalize} Connection Extender" do
     before(:each) do
       @org_test_db = ENV['RR_TEST_DB']
       ENV['RR_TEST_DB'] = extender.to_s

data/spec/logged_change_spec.rb

@@ -121,8 +121,8 @@ describe LoggedChange do
       change = LoggedChange.new loader
       change.load_specified 'left_table', {'id' => 1}
 
-      change.first_changed_at.to_s.should == t1.to_s
-      change.last_changed_at.to_s.should == t2.to_s
+      (change.first_changed_at - t1).abs.should < 1
+      (change.last_changed_at - t2).abs.should < 1
     ensure
       session.left.rollback_db_transaction
     end

data/spec/noisy_connection_spec.rb

@@ -12,10 +12,8 @@ describe NoisyConnection do
 
   it "select_cursor should return correct results" do
     @connection.sweeper.should_receive(:ping).exactly(4).times
-    fetcher = @connection.select_cursor(:table => 'scanner_records')
-    row = fetcher.next_row
-    row.should == {
-      'id' => '1',
+    @connection.select_record(:table => 'scanner_records').should == {
+      'id' => 1,
       'name' => 'Alice - exists in both databases'
     }
   end
@@ -26,9 +24,8 @@ describe NoisyConnection do
     begin
       @connection.insert_record('extender_combined_key', 'first_id' => 8, 'second_id' => '9', 'name' => nil)
       @connection.select_one(
-        "select first_id, second_id, name
-         from extender_combined_key where (first_id, second_id) = (8, 9)") \
-        .should == {'first_id' => '8', 'second_id' => '9', "name" => nil}
+        "select name from extender_combined_key where (first_id, second_id) = (8, 9)"
+      ).should == {"name" => nil}
     ensure
       @connection.rollback_db_transaction
     end
@@ -39,8 +36,9 @@ describe NoisyConnection do
     @connection.begin_db_transaction
     begin
       @connection.update_record('scanner_records', 'id' => 1, 'name' => 'update_test')
-      @connection.select_one("select * from scanner_records where id = 1") \
-        .should == {'id' => '1', 'name' => 'update_test'}
+      @connection.select_one(
+        "select name from scanner_records where id = 1"
+      ).should == {'name' => 'update_test'}
     ensure
       @connection.rollback_db_transaction
     end

data/spec/postgresql_schema_support_spec.rb

@@ -61,9 +61,12 @@ describe "PostgreSQL schema support" do
         should == 'select "id", "name" from "rr_simple" order by "id"'
     end
 
-    it "TypeCasingCursor should work" do
+    it "TypeCastingCursor should work" do
       session = Session.new
-      org_cursor = session.left.select_cursor(:query => "select id, name from rr_simple where id = 1")
+      org_cursor = session.left.select_cursor(
+        :query => "select id, name from rr_simple where id = 1",
+        :type_cast => false
+      )
       cursor = TypeCastingCursor.new session.left, 'rr_simple', org_cursor
 
       row = cursor.next_row

data/spec/postgresql_support_spec.rb

@@ -23,7 +23,10 @@ describe "PostgreSQL support" do
           {'id' => 2, 'timestamp' => Time.local(2009, "feb", 16, 20, 48, 1, 543)}
         )
 
-        org_cursor = session.left.select_cursor(:query => "select id, timestamp from extender_type_check where id = 2")
+        org_cursor = session.left.select_cursor(
+          :query => "select id, timestamp from extender_type_check where id = 2",
+          :type_cast => false
+        )
         cursor = TypeCastingCursor.new session.left, 'extender_type_check', org_cursor
 
         row = cursor.next_row
@@ -43,7 +46,10 @@ describe "PostgreSQL support" do
           {'id' => 2, 'timestamp' => Time.local(2009, "feb", 16, 13, 37, 11, 126291)}
         )
 
-        org_cursor = session.left.select_cursor(:query => "select id, timestamp from extender_type_check where id = 2")
+        org_cursor = session.left.select_cursor(
+          :query => "select id, timestamp from extender_type_check where id = 2",
+          :type_cast => false
+        )
         cursor = TypeCastingCursor.new session.left, 'extender_type_check', org_cursor
 
         row = cursor.next_row

data/spec/proxy_connection_spec.rb

@@ -115,9 +115,9 @@ describe ProxyConnection do
   # (To verify the behaviour for all supported databases)
 
   it "select_cursor should return the result fetcher" do
-    fetcher = @connection.select_cursor(:table => 'scanner_records')
+    fetcher = @connection.select_cursor(:table => 'scanner_records', :type_cast => false)
     fetcher.connection.should == @connection
-    fetcher.options.should == {:table => 'scanner_records'}
+    fetcher.options.should == {:table => 'scanner_records', :type_cast => false}
   end
 
   it "select_cursor should return a type casting cursor if :type_cast option is specified" do
@@ -222,8 +222,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.insert_record('scanner_records', 'id' => 9, 'name' => 'bla')
-      @connection.select_one("select * from scanner_records where id = 9") \
-        .should == {'id' => '9', 'name' => 'bla'}
+      @connection.select_record(
+        :table => 'scanner_records',
+        :row_keys => ['id' => 9]
+      ).should == {'id' => 9, 'name' => 'bla'}
     ensure
       @connection.rollback_db_transaction
     end
@@ -233,10 +235,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.insert_record('extender_combined_key', 'first_id' => 8, 'second_id' => '9')
-      @connection.select_one(
-        "select first_id, second_id 
-         from extender_combined_key where (first_id, second_id) = (8, 9)") \
-        .should == {'first_id' => '8', 'second_id' => '9'}
+      @connection.select_record(
+        :table => 'extender_combined_key',
+        :row_keys => ['first_id' => 8, 'second_id' => 9]
+      ).should == {'first_id' => 8, 'second_id' => 9, 'name' => nil}
     ensure
       @connection.rollback_db_transaction
     end
@@ -246,10 +248,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.insert_record('extender_combined_key', 'first_id' => 8, 'second_id' => '9', 'name' => nil)
-      @connection.select_one(
-        "select first_id, second_id, name 
-         from extender_combined_key where (first_id, second_id) = (8, 9)") \
-        .should == {'first_id' => '8', 'second_id' => '9', "name" => nil}
+      @connection.select_record(
+        :table => 'extender_combined_key',
+        :row_keys => ['first_id' => 8, 'second_id' => 9]
+      ).should == {'first_id' => 8, 'second_id' => 9, "name" => nil}
     ensure
       @connection.rollback_db_transaction
     end
@@ -289,8 +291,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.update_record('scanner_records', 'id' => 1, 'name' => 'update_test')
-      @connection.select_one("select * from scanner_records where id = 1") \
-        .should == {'id' => '1', 'name' => 'update_test'}
+      @connection.select_record(
+        :table => "scanner_records",
+        :row_keys => ['id' => 1]
+      ).should == {'id' => 1, 'name' => 'update_test'}
     ensure
       @connection.rollback_db_transaction
     end
@@ -314,10 +318,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.update_record('extender_combined_key', 'first_id' => 1, 'second_id' => '1', 'name' => 'xy')
-      @connection.select_one(
-        "select first_id, second_id, name
-         from extender_combined_key where (first_id, second_id) = (1, 1)") \
-        .should == {'first_id' => '1', 'second_id' => '1', 'name' => 'xy'}
+      @connection.select_record(
+        :table => 'extender_combined_key',
+        :row_keys => ['first_id' => 1, 'second_id' => 1]
+      ).should == {'first_id' => 1, 'second_id' => 1, 'name' => 'xy'}
     ensure
       @connection.rollback_db_transaction
     end
@@ -329,10 +333,10 @@ describe ProxyConnection do
       @connection.update_record 'extender_combined_key',
         {'first_id' => '8', 'second_id' => '9', 'name' => 'xy'},
         {'first_id' => '1', 'second_id' => '1'}
-      @connection.select_one(
-        "select first_id, second_id, name
-         from extender_combined_key where (first_id, second_id) = (8, 9)") \
-        .should == {'first_id' => '8', 'second_id' => '9', 'name' => 'xy'}
+      @connection.select_record(
+        :table => 'extender_combined_key',
+        :row_keys => ['first_id' => 8, 'second_id' => 9]
+      ).should == {'first_id' => 8, 'second_id' => 9, 'name' => 'xy'}
     ensure
       @connection.rollback_db_transaction
     end
@@ -342,10 +346,10 @@ describe ProxyConnection do
     @connection.begin_db_transaction
     begin
       @connection.update_record('extender_combined_key', 'first_id' => 1, 'second_id' => '1', 'name' => nil)
-      @connection.select_one(
-        "select first_id, second_id, name
-         from extender_combined_key where (first_id, second_id) = (1, 1)") \
-        .should == {'first_id' => '1', 'second_id' => '1', 'name' => nil}
+      @connection.select_record(
+        :table => 'extender_combined_key',
+        :row_keys => ['first_id' => 1, 'second_id' => 1]
+      ).should == {'first_id' => 1, 'second_id' => 1, 'name' => nil}
     ensure
       @connection.rollback_db_transaction
     end
@@ -364,10 +368,10 @@ describe ProxyConnection do
       }
       @connection.update_record('extender_type_check', test_data)
 
-      org_cursor = @connection.select_cursor(:query => "select * from extender_type_check where id = 1")
-      cursor = TypeCastingCursor.new @connection, 'extender_type_check', org_cursor
-      result_data = cursor.next_row
-      result_data.should == test_data
+      @connection.select_record(
+        :table => "extender_type_check",
+        :row_keys => ["id" => 1]
+      ).should == test_data
     ensure
       @connection.rollback_db_transaction
     end

data/spec/replication_helper_spec.rb

@@ -22,6 +22,28 @@ describe ReplicationHelper do
     helper.session.should == rep_run.session
   end
 
+  it "type_cast should convert the row values correctly" do
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
+
+    helper = ReplicationHelper.new(rep_run)
+    helper.type_cast('scanner_records', 'id' => '1', 'name' => 'bla').
+      should == {'id' => 1, 'name' => 'bla'}
+
+    string_row = {
+      'id' => '1',
+      'decimal_test' => '1.234',
+      'timestamp' => 'Sat Nov 10 20:15:01 +0900 2007',
+      'binary_test' => "\004\b[\n\"\bbla:\ndummyi\006i\ai\b"
+    }
+    row = helper.type_cast('extender_type_check', string_row)
+    row.should == {
+      'id' => 1,
+      'decimal_test' => BigDecimal.new("1.234"),
+      'timestamp' => Time.local(2007,"nov",10,20,15,1),
+      'binary_test' => Marshal.dump(['bla',:dummy,1,2,3])
+    }
+  end
+
   it "new_transaction? should delegate to the committer" do
     session = Session.new
     rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
@@ -85,6 +107,24 @@ describe ReplicationHelper do
     }
   end
 
+  it "options_for_table should return the correct options for the table" do
+    Initializer.configuration.options = {:a => 1, :b => 2}
+    Initializer.configuration.add_table_options 'scanner_records', {:b => 3}
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
+    helper = ReplicationHelper.new(rep_run)
+    options = helper.options_for_table('scanner_records')
+    options[:a].should == 1
+    options[:b].should == 3
+  end
+
+  it "options_for_table should merge the configured options into the default two way replicator options" do
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
+    helper = ReplicationHelper.new(rep_run)
+    helper.options_for_table('scanner_records').include?(:left_change_handling).should be_true
+    helper.options_for_table('scanner_records').include?(:right_change_handling).should be_true
+    helper.options_for_table('scanner_records').include?(:replication_conflict_handling).should be_true
+  end
+
   it "log_replication_outcome should log the replication outcome correctly" do
     session = Session.new
     session.left.begin_db_transaction

data/spec/replication_run_spec.rb

@@ -40,6 +40,66 @@ describe ReplicationRun do
     run.replicator.rep_helper.should == run.helper
   end
 
+  it "event_filtered? should behave correctly" do
+    begin
+      config = deep_copy(standard_config)
+      config.options[:committer] = :never_commit
+      session = Session.new(config)
+
+      session.left.insert_record 'extender_no_record', {
+        'id' => '1',
+        'name' => 'bla'
+      }
+      session.left.insert_record 'rr_pending_changes', {
+        'change_table' => 'extender_no_record',
+        'change_key' => 'id|1',
+        'change_type' => 'I',
+        'change_time' => Time.now
+      }
+
+      loaders = LoggedChangeLoaders.new(session)
+      loaders.update
+      diff = ReplicationDifference.new loaders
+      diff.load
+
+      # No event filter at all
+      run = ReplicationRun.new session, TaskSweeper.new(1)
+      run.event_filtered?(diff).should be_false
+
+      # Event filter that does not handle replication events
+      session.configuration.options[:event_filter] = Object.new
+      run = ReplicationRun.new session, TaskSweeper.new(1)
+      run.event_filtered?(diff).should be_false
+
+      # event_filtered? should signal filtering (i. e. return true) if filter returns false.
+      filter = Object.new
+      def filter.before_replicate(table, key, helper, diff)
+        false
+      end
+      session.configuration.options[:event_filter] = filter
+      run = ReplicationRun.new session, TaskSweeper.new(1)
+      run.event_filtered?(diff).should be_true
+
+      # event_filtered? should return false if filter returns true.
+      filter = {}
+      def filter.before_replicate(table, key, helper, diff)
+        self[:args] = [table, key, helper, diff]
+        true
+      end
+      session.configuration.options[:event_filter] = filter
+      run = ReplicationRun.new session, TaskSweeper.new(1)
+      run.event_filtered?(diff).should be_false
+      filter[:args].should == ['extender_no_record', {'id' => 1}, run.helper, diff]
+    ensure
+      Committers::NeverCommitter.rollback_current_session
+      if session
+        session.left.execute "delete from extender_no_record"
+        session.right.execute "delete from extender_no_record"
+        session.left.execute "delete from rr_pending_changes"
+      end
+    end
+  end
+
   it "run should replicate all logged changes" do
     begin
       config = deep_copy(standard_config)
@@ -61,10 +121,61 @@ describe ReplicationRun do
       run = ReplicationRun.new session, TaskSweeper.new(1)
       run.run
 
-      session.right.select_one("select * from extender_no_record").should == {
+      session.right.select_record(:table => "extender_no_record").should == {
+        'id' => 1,
+        'name' => 'bla'
+      }
+    ensure
+      Committers::NeverCommitter.rollback_current_session
+      if session
+        session.left.execute "delete from extender_no_record"
+        session.right.execute "delete from extender_no_record"
+        session.left.execute "delete from rr_pending_changes"
+      end
+    end
+  end
+
+  it "run should not replicate filtered changes" do
+    begin
+      config = deep_copy(standard_config)
+      config.options[:committer] = :never_commit
+
+      filter = Object.new
+      def filter.before_replicate(table, key, helper, diff)
+        key['id'] != 1
+      end
+      config.options[:event_filter] = filter
+
+      session = Session.new(config)
+
+      session.left.insert_record 'extender_no_record', {
         'id' => '1',
         'name' => 'bla'
       }
+      session.left.insert_record 'extender_no_record', {
+        'id' => '2',
+        'name' => 'blub'
+      }
+      session.left.insert_record 'rr_pending_changes', {
+        'change_table' => 'extender_no_record',
+        'change_key' => 'id|1',
+        'change_type' => 'I',
+        'change_time' => Time.now
+      }
+      session.left.insert_record 'rr_pending_changes', {
+        'change_table' => 'extender_no_record',
+        'change_key' => 'id|2',
+        'change_type' => 'I',
+        'change_time' => Time.now
+      }
+
+      run = ReplicationRun.new session, TaskSweeper.new(1)
+      run.run
+
+      session.right.select_records(:table => "extender_no_record").should == [{
+        'id' => 2,
+        'name' => 'blub'
+      }]
     ensure
       Committers::NeverCommitter.rollback_current_session
       if session
@@ -247,8 +358,8 @@ describe ReplicationRun do
       run = ReplicationRun.new session, TaskSweeper.new(1)
       run.run
 
-      session.right.select_one("select * from extender_no_record").should == {
-        'id' => '1',
+      session.right.select_record(:table => "extender_no_record").should == {
+        'id' => 1,
         'name' => 'bla'
       }
 

data/spec/replicators_spec.rb

@@ -21,6 +21,11 @@ describe Replicators do
     Replicators.replicators.should == :dummy_data
   end
 
+  it "configured_replicator should return the correct replicator" do
+    options = {:replicator => :two_way}
+    Replicators.configured_replicator(options).should == Replicators::TwoWayReplicator
+  end
+  
   it "register should register the provided replicator" do
     Replicators.instance_variable_set :@replicators, nil
     Replicators.register :a_key => :a

data/spec/strange_name_support_spec.rb

@@ -11,10 +11,21 @@ describe "Unusual table and column name support" do
     session = Session.new
     session.left.begin_db_transaction
     begin
-      session.left.insert_record STRANGE_TABLE, {
-        'id' => 1,
-        STRANGE_COLUMN => 'bla'
+      select_row = Proc.new {
+        session.left.
+          select_one(
+          "select #{session.left.quote_column_name(STRANGE_COLUMN)}
+           from #{session.left.quote_table_name(STRANGE_TABLE)}")
       }
+
+      session.left.insert_record STRANGE_TABLE, 'id' => 1, STRANGE_COLUMN => 'bla'
+      select_row.call[STRANGE_COLUMN].should == 'bla'
+
+      session.left.update_record STRANGE_TABLE, 'id' => 1, STRANGE_COLUMN => 'blub'
+      select_row.call[STRANGE_COLUMN].should == 'blub'
+
+      session.left.delete_record STRANGE_TABLE, 'id' => 1
+      select_row.call.should be_nil
     ensure
       session.left.rollback_db_transaction
     end

data/spec/sync_helper_spec.rb

@@ -21,6 +21,13 @@ describe SyncHelper do
     helper.session.should == sync.session
   end
 
+  it "extract_key should extract the primary key column_name => value pairs" do
+    sync = TableSync.new(Session.new, 'extender_combined_key')
+    helper = SyncHelper.new(sync)
+    helper.extract_key('first_id' => 1, 'second_id' => 2, 'name' => 'bla').
+      should == {'first_id' => 1, 'second_id' => 2}
+  end
+
   it "ensure_event_log should ask the replication_initializer to ensure the event log" do
     sync = TableSync.new(Session.new, 'scanner_records')
     helper = SyncHelper.new(sync)
@@ -120,7 +127,7 @@ describe SyncHelper do
     helper = SyncHelper.new(sync)
     c = helper.instance_eval {committer}
     c.should_receive(:insert_record).with(:right, 'scanner_records', :dummy_record)
-    helper.insert_record :right, :dummy_record
+    helper.insert_record :right, 'scanner_records', :dummy_record
   end
 
   it "update_record should update the given record" do
@@ -128,7 +135,7 @@ describe SyncHelper do
     helper = SyncHelper.new(sync)
     c = helper.instance_eval {committer}
     c.should_receive(:update_record).with(:right, 'scanner_records', :dummy_record, nil)
-    helper.update_record :right, :dummy_record
+    helper.update_record :right, 'scaner_records', :dummy_record
   end
 
   it "update_record should update the given record with the provided old key" do
@@ -136,7 +143,7 @@ describe SyncHelper do
     helper = SyncHelper.new(sync)
     c = helper.instance_eval {committer}
     c.should_receive(:update_record).with(:right, 'scanner_records', :dummy_record, :old_key)
-    helper.update_record :right, :dummy_record, :old_key
+    helper.update_record :right, 'scanner_records', :dummy_record, :old_key
   end
 
   it "delete_record should delete the given record" do
@@ -144,7 +151,7 @@ describe SyncHelper do
     helper = SyncHelper.new(sync)
     c = helper.instance_eval {committer}
     c.should_receive(:delete_record).with(:right, 'scanner_records', :dummy_record)
-    helper.delete_record :right, :dummy_record
+    helper.delete_record :right, 'scanner_records', :dummy_record
   end
 
   it "finalize should be delegated to the committer" do