spec/pull_spec.rb in eternity-0.0.2 vs spec/pull_spec.rb in eternity-0.0.3

@@ -109,16 +109,12 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_4.id, commit_3.id]
+      commit.parents.must_equal [commit_4, commit_3]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {
-        'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}, 
-        'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
-      }
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {
         'AR' => digest(name: 'Argentina'), 
         'UY' => digest(name: 'Uruguay'),
         'BR' => digest(name: 'Brasil')
@@ -148,13 +144,12 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 2'}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina 2')}
     end
   end
 
@@ -180,13 +175,12 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG', number: 54)}
     end
   end
 
@@ -212,13 +206,12 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
     
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'X' => {'action' => 'insert', 'data' => {'name' => 'X1', 'number' => 2, 'code' => 1}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {
         'AR' => digest(name: 'Argentina'),
         'X'  => digest(name: 'X1', 'number' => 2, 'code' => 1)
       }
@@ -247,13 +240,12 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
     
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'delete'}}
       commit.delta.must_be_empty
       commit.must_have_empty_index
     end
   end
 
@@ -279,12 +271,11 @@
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG'}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG')}
     end
   end
 
\ No newline at end of file