kintsugi 0.5.2 → 0.6.0

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -34,7 +34,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -46,7 +45,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -60,7 +58,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -72,29 +69,29 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
 
-  it "adds subproject that already exists" do
-    theirs_project = create_copy_of_project(base_project.path, "theirs")
+  it "removes reference proxy from subproject with the same display name as another reference proxy" do
+    framework_filename = "baz"
+    subproject = add_new_subproject_to_project(base_project, "subproj", framework_filename)
 
-    subproject = add_new_subproject_to_project(theirs_project, "foo", "foo")
-    theirs_project.save
+    subproject.new_target("com.apple.product-type.library.static", framework_filename, :ios)
+    base_project.root_object.project_references[0][:product_group] <<
+      create_reference_proxy_from_product_reference(base_project,
+                                                    base_project.root_object.project_references[0][:project_ref],
+                                                    subproject.products_group.files[-1])
+    base_project.save
 
-    ours_project = create_copy_of_project(base_project.path, "ours")
-    add_existing_subproject_to_project(ours_project, subproject, "foo")
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.root_object.project_references[0][:product_group].children[-1].remove_from_project
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
-    described_class.apply_change_to_project(ours_project, changes_to_apply)
-    ours_project.save
+    described_class.apply_change_to_project(base_project, changes_to_apply)
 
-    expect(ours_project.root_object.project_references[0][:project_ref].uuid)
-      .not_to equal(ours_project.root_object.project_references[1][:project_ref].uuid)
-    expect(ours_project.root_object.project_references[0][:project_ref].proxy_containers).not_to be_empty
-    expect(ours_project.root_object.project_references[1][:project_ref].proxy_containers).not_to be_empty
+    expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
   # Checks that the order the changes are applied in is correct.
@@ -110,7 +107,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
@@ -152,11 +148,28 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "raises when a file is split into two" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.main_group.find_subpath("new_group2", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group = theirs_project.main_group.find_subpath("new_group")
+      file_reference = theirs_project.main_group.find_file_by_path(filepath)
+      file_reference.move(new_group)
+      theirs_project.main_group.find_subpath("new_group2").new_reference(filepath)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+
     it "adds file to new group" do
       theirs_project = create_copy_of_project(base_project.path, "theirs")
 
@@ -165,8 +178,21 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "removes group" do
+      base_project.main_group.find_subpath("new_group", true)
       base_project.save
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project["new_group"].remove_from_project
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
@@ -179,7 +205,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -203,7 +228,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -225,6 +249,22 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "ignores removal of a non-existent group" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.children.delete_at(-1)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      base_project.main_group.children.delete_at(-1)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "removes build files of a removed file" do
       target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
       target.source_build_phase.add_file_reference(
@@ -244,7 +284,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -260,7 +299,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -275,25 +313,21 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
     it "handles moved file to an existing group with a different path on filesystem" do
       base_project.main_group.find_subpath("new_group", true).path = "some_path"
-
       base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
       new_group = theirs_project.main_group.find_subpath("new_group")
-
       theirs_project.main_group.find_file_by_path(filepath).move(new_group)
 
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -312,7 +346,6 @@ describe Kintsugi, :apply_change_to_project do
         ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
       end
@@ -330,7 +363,6 @@ describe Kintsugi, :apply_change_to_project do
         ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
       end
@@ -348,7 +380,6 @@ describe Kintsugi, :apply_change_to_project do
         ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
       end
@@ -363,7 +394,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expect(ours_project).to be_equivalent_to_project(theirs_project)
       end
@@ -377,6 +407,54 @@ describe Kintsugi, :apply_change_to_project do
       base_project.save
     end
 
+    it "moves file that is referenced by a target from main group to a new group" do
+      file_reference = base_project.main_group.new_reference("bar")
+      base_project.targets[0].source_build_phase.add_file_reference(file_reference)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group = theirs_project.main_group.find_subpath("new_group", true)
+      file_reference = theirs_project.main_group.find_file_by_path("bar")
+      file_reference.move(new_group)
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "moves file that is referenced by a target from a group to the main group" do
+      file_reference = base_project.main_group.find_subpath("new_group", true).new_reference("bar")
+      base_project.targets[0].source_build_phase.add_file_reference(file_reference)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      file_reference = theirs_project["new_group/bar"]
+      file_reference.move(theirs_project.main_group)
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "moves file that is referenced by a target and has a different file encoding" do
+      file_reference = base_project.main_group.find_subpath("new_group", true).new_reference("bar")
+      target.frameworks_build_phase.add_file_reference(file_reference)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      file_reference = theirs_project["new_group/bar"]
+      file_reference.move(theirs_project.main_group)
+      file_reference.fileEncoding = "4"
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
     it "changes framework from file reference to reference proxy" do
       framework_filename = "baz"
 
@@ -389,7 +467,7 @@ describe Kintsugi, :apply_change_to_project do
       theirs_project = create_copy_of_project(base_project.path, "theirs")
 
       build_phase = theirs_project.targets[0].frameworks_build_phase
-      build_phase.files[0].remove_from_project
+      build_phase.files.find { |build_file| build_file.display_name == "baz" }.remove_from_project
       build_phase.add_file_reference(
         theirs_project.root_object.project_references[0][:product_group].children[0]
       )
@@ -397,7 +475,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -410,7 +487,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -427,7 +503,8 @@ describe Kintsugi, :apply_change_to_project do
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      file_reference = theirs_project.main_group.new_reference(framework_filename)
+      file_reference = theirs_project.main_group.new_reference("bar")
+      file_reference.name = framework_filename
       build_phase = theirs_project.targets[0].frameworks_build_phase
       build_phase.files[-1].remove_from_project
       theirs_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
@@ -435,7 +512,10 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+      # This verifies we haven't created a new file reference instead of reusing the one in the
+      # hierarchy.
+      base_project.files[-1].name = "foo"
+      theirs_project.files[-1].name = "foo"
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -462,7 +542,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply["rootObject"].delete("projectReferences")
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -489,7 +568,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -506,7 +584,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -526,16 +603,13 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
 
-    it "adds build file to a file reference that already exist" do
+    it "adds build file to a file reference that already exists" do
       base_project.main_group.new_reference("bar")
-
       base_project.main_group.new_reference("bar")
-
       base_project.save
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
@@ -549,17 +623,14 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
     it "adds file reference to build file" do
       file_reference = base_project.main_group.new_reference("bar")
-
       build_file = base_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
       build_file.file_ref = nil
-
       base_project.save
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
@@ -570,7 +641,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -580,7 +650,6 @@ describe Kintsugi, :apply_change_to_project do
       base_project.save
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
-
       file_reference = theirs_project.main_group.files.find { |file| file.display_name == "bar" }
       build_file =
         theirs_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
@@ -590,7 +659,6 @@ describe Kintsugi, :apply_change_to_project do
 
       other_project = create_copy_of_project(base_project.path, "other")
       described_class.apply_change_to_project(other_project, changes_to_apply)
-      other_project.save
 
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -616,7 +684,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -632,7 +699,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -641,7 +707,6 @@ describe Kintsugi, :apply_change_to_project do
         base_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings = {}
         end
-
         theirs_project = create_copy_of_project(base_project.path, "theirs")
 
         theirs_project.targets[0].build_configurations.each do |configuration|
@@ -654,7 +719,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -672,7 +736,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -696,7 +759,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -713,10 +775,8 @@ describe Kintsugi, :apply_change_to_project do
         ours_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
         end
-        ours_project.save
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expected_project = create_copy_of_project(base_project.path, "expected")
         expected_project.targets[0].build_configurations.each do |configuration|
@@ -737,10 +797,8 @@ describe Kintsugi, :apply_change_to_project do
         ours_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
         end
-        ours_project.save
 
         described_class.apply_change_to_project(ours_project, changes_to_apply)
-        ours_project.save
 
         expected_project = create_copy_of_project(base_project.path, "expected")
         expected_project.targets[0].build_configurations.each do |configuration|
@@ -756,10 +814,9 @@ describe Kintsugi, :apply_change_to_project do
             "$(SRCROOT)/../Bar"
           ]
         end
-
         base_project.save
-        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = nil
         end
@@ -767,7 +824,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -776,10 +832,9 @@ describe Kintsugi, :apply_change_to_project do
         base_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
         end
-
         base_project.save
-        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings =
             configuration.build_settings.reject { |key, _| key == "HEADER_SEARCH_PATHS" }
@@ -788,7 +843,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -797,8 +851,8 @@ describe Kintsugi, :apply_change_to_project do
         base_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
         end
-
         base_project.save
+
         theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings = nil
@@ -807,7 +861,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -817,8 +870,8 @@ describe Kintsugi, :apply_change_to_project do
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
           configuration.build_settings["foo"] = "baz"
         end
-
         base_project.save
+
         theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings = nil
@@ -832,7 +885,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -853,7 +905,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -874,7 +925,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -935,10 +985,9 @@ describe Kintsugi, :apply_change_to_project do
         base_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
         end
-
         base_project.save
-        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
         end
@@ -946,7 +995,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -955,10 +1003,9 @@ describe Kintsugi, :apply_change_to_project do
         base_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
         end
-
         base_project.save
-        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.targets[0].build_configurations.each do |configuration|
           configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[baz foo]
         end
@@ -966,7 +1013,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -993,7 +1039,6 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
 
         described_class.apply_change_to_project(base_project, changes_to_apply)
-        base_project.save
 
         expect(base_project).to be_equivalent_to_project(expected_project)
       end
@@ -1057,23 +1102,32 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+
+      expect(base_project).to be_equivalent_to_project(theirs_project)
+    end
+
+    it "adds build phase with a simple attribute value that has non nil default" do
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.targets[0].new_shell_script_build_phase("bar")
+      theirs_project.targets[0].build_phases.last.shell_script = "Other value"
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(base_project, changes_to_apply)
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
     it "removes build phase" do
       base_project.targets[0].new_shell_script_build_phase("bar")
-
       base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
       theirs_project.targets[0].shell_script_build_phases[0].remove_from_project
 
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1083,33 +1137,29 @@ describe Kintsugi, :apply_change_to_project do
       file = variant_group.new_reference("Base")
       file.last_known_file_type = "text.plist.strings"
       target.resources_build_phase.add_file_reference(variant_group)
-
       base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
       theirs_variant_group = theirs_project.main_group.find_subpath("foo.strings")
       theirs_variant_group.new_reference("en")
 
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
     it "adds target dependency" do
       base_project.new_target("com.apple.product-type.library.static", "bar", :ios)
-
       base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
       theirs_project.targets[1].add_dependency(theirs_project.targets[0])
 
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1118,10 +1168,9 @@ describe Kintsugi, :apply_change_to_project do
       base_project.targets[0].build_configurations.each do |configuration|
         configuration.build_settings["GCC_PREFIX_HEADER"] = "foo"
       end
-
       base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
 
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
       theirs_project.targets[0].build_configurations.each do |configuration|
         configuration.build_settings["GCC_PREFIX_HEADER"] = "bar"
       end
@@ -1129,16 +1178,13 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
     it "adds build settings to new target" do
       theirs_project = create_copy_of_project(base_project.path, "theirs")
-
       theirs_project.new_target("com.apple.product-type.library.static", "bar", :ios)
-
       theirs_project.targets[1].build_configurations.each do |configuration|
         configuration.build_settings["GCC_PREFIX_HEADER"] = "baz"
       end
@@ -1146,7 +1192,6 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1155,7 +1200,6 @@ describe Kintsugi, :apply_change_to_project do
       base_project.main_group.new_reference("baz")
 
       theirs_project = create_copy_of_project(base_project.path, "theirs")
-
       configuration_reference = theirs_project.main_group.find_subpath("baz")
       theirs_project.targets[0].build_configurations.each do |configuration|
         configuration.base_configuration_reference = configuration_reference
@@ -1164,35 +1208,29 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
 
       described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
   end
 
   it "adds known regions" do
-    base_project.save
     theirs_project = create_copy_of_project(base_project.path, "theirs")
-
     theirs_project.root_object.known_regions += ["fr"]
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
   it "removes known regions" do
     theirs_project = create_copy_of_project(base_project.path, "theirs")
-
     theirs_project.root_object.known_regions = nil
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1206,7 +1244,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1216,14 +1253,12 @@ describe Kintsugi, :apply_change_to_project do
     base_project.save
 
     theirs_project = create_copy_of_project(base_project.path, "theirs")
-
     theirs_project.root_object.attributes["TargetAttributes"] =
       {"foo" => {"LastSwiftMigration" => "1140"}}
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1233,14 +1268,12 @@ describe Kintsugi, :apply_change_to_project do
     base_project.save
 
     theirs_project = create_copy_of_project(base_project.path, "theirs")
-
     theirs_project.root_object.attributes["TargetAttributes"] =
       {"foo" => {"LastSwiftMigration" => "1140"}}
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1251,13 +1284,11 @@ describe Kintsugi, :apply_change_to_project do
     base_project.save
 
     theirs_project = create_copy_of_project(base_project.path, "theirs")
-
     theirs_project.root_object.attributes["TargetAttributes"]["foo"] = {}
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1276,7 +1307,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(ours_project, changes_to_apply)
-    ours_project.save
 
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1294,7 +1324,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
 
     described_class.apply_change_to_project(ours_project, changes_to_apply)
-    ours_project.save
 
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1322,7 +1351,6 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(ours_project, theirs_project)
 
     described_class.apply_change_to_project(base_project, changes_to_apply)
-    base_project.save
 
     expect(base_project).to be_equivalent_to_project(ours_project, ignore_keys: ["containerPortal"])
   end
@@ -1346,6 +1374,213 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
+  it "adds build configuration list" do
+    base_project.root_object.build_configuration_list = nil
+    base_project.save
+
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.root_object.build_configuration_list =
+      theirs_project.new(Xcodeproj::Project::XCConfigurationList)
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(base_project, changes_to_apply)
+    expect(base_project).to be_equivalent_to_project(theirs_project)
+  end
+
+  it "removes build configuration list" do
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.build_configuration_list.remove_from_project
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(base_project, changes_to_apply)
+    expect(base_project).to be_equivalent_to_project(theirs_project)
+  end
+
+  it "adds group to product group" do
+    base_project_path = make_temp_directory("base", ".xcodeproj")
+    base_project = Xcodeproj::Project.new(base_project_path)
+    base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+
+    base_project.save
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    theirs_project.root_object.product_ref_group.new_group("foo")
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(base_project, changes_to_apply)
+
+    expect(base_project).to be_equivalent_to_project(theirs_project)
+  end
+
+  it "adds localization files to product group" do
+    base_project_path = make_temp_directory("base", ".xcodeproj")
+    base_project = Xcodeproj::Project.new(base_project_path)
+    base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+
+    base_project.save
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    variant_group = theirs_project.root_object.product_ref_group.new_variant_group("foo.strings")
+    variant_group.new_reference("Base").last_known_file_type = "text.plist.strings"
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    described_class.apply_change_to_project(base_project, changes_to_apply)
+
+    expect(base_project).to be_equivalent_to_project(theirs_project)
+  end
+
+  describe "avoiding duplicate references to the same component" do
+    it "avoids adding file reference that already exists" do
+      base_project.main_group.new_reference("bar")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.new_reference("bar")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(base_project)
+    end
+
+    it "avoids adding group that already exists" do
+      base_project.main_group.new_group("bar")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.new_group("bar")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(base_project)
+    end
+
+    it "avoids adding variant group that already exists" do
+      base_project.main_group.new_variant_group("bar")
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.new_variant_group("bar")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(base_project)
+    end
+
+    it "avoids adding subproject that already exists" do
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+      subproject = add_new_subproject_to_project(theirs_project, "foo", "foo")
+
+      ours_project = create_copy_of_project(base_project.path, "ours")
+      add_existing_subproject_to_project(ours_project, subproject, "foo")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(ours_project, changes_to_apply)
+
+      expect(ours_project.root_object.project_references.count).to equal(1)
+    end
+
+    it "avoids adding build file that already exists" do
+      file_reference = base_project.main_group.new_reference("bar")
+      target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+      target.frameworks_build_phase.add_file_reference(file_reference)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      file_reference = theirs_project.main_group.new_reference("bar")
+      theirs_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(base_project)
+    end
+
+    it "avoids adding reference proxy that already exists" do
+      framework_filename = "baz"
+      subproject = add_new_subproject_to_project(base_project, "subproj", framework_filename)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+      theirs_project.root_object.project_references[0][:product_group] <<
+        create_reference_proxy_from_product_reference(theirs_project,
+                                                      theirs_project.root_object.project_references[0][:project_ref],
+                                                      subproject.products_group.files[-1])
+
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      other_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(other_project, changes_to_apply)
+
+      expect(other_project).to be_equivalent_to_project(base_project)
+    end
+
+    it "keeps array if adding string value that already exists in array" do
+      base_project.new_target("com.apple.product-type.library.static", "bar", :ios)
+      base_project.save
+
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.targets[0].build_configurations.each do |configuration|
+        configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+      end
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      ours_project = create_copy_of_project(base_project.path, "ours")
+      ours_project.targets[0].build_configurations.each do |configuration|
+        configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
+      end
+      ours_project.save
+
+      expected_project = create_copy_of_project(ours_project.path, "expected")
+
+      described_class.apply_change_to_project(ours_project, changes_to_apply)
+
+      expect(ours_project).to be_equivalent_to_project(expected_project)
+    end
+  end
+
+  describe "allowing adding reference to the same component" do
+    before do
+      Kintsugi::Settings.allow_duplicates = true
+    end
+
+    after do
+      Kintsugi::Settings.allow_duplicates = false
+    end
+
+    it "adds subproject that already exists" do
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+      subproject = add_new_subproject_to_project(theirs_project, "foo", "foo")
+
+      ours_project = create_copy_of_project(base_project.path, "ours")
+      add_existing_subproject_to_project(ours_project, subproject, "foo")
+
+      changes_to_apply = get_diff(theirs_project, base_project)
+
+      described_class.apply_change_to_project(ours_project, changes_to_apply)
+
+      expect(ours_project.root_object.project_references[0][:project_ref].uuid)
+        .not_to equal(ours_project.root_object.project_references[1][:project_ref].uuid)
+      expect(ours_project.root_object.project_references[0][:project_ref].proxy_containers).not_to be_empty
+      expect(ours_project.root_object.project_references[1][:project_ref].proxy_containers).not_to be_empty
+    end
+  end
+
   def create_copy_of_project(project_path, new_project_prefix)
     copied_project_path = make_temp_directory(new_project_prefix, ".xcodeproj")
     FileUtils.cp(File.join(project_path, "project.pbxproj"), copied_project_path)