kintsugi 0.4.3 → 0.5.3

data/spec/kintsugi_apply_change_to_project_spec.rb

@@ -8,6 +8,7 @@ require "tempfile"
 require "tmpdir"
 
 require "kintsugi/apply_change_to_project"
+require "kintsugi/error"
 
 require_relative "be_equivalent_to_project"
 
@@ -50,6 +51,20 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
 
+  it "adds package reference" do
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    theirs_project.root_object.package_references <<
+      create_remote_swift_package_reference(theirs_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
+
   it "adds new subproject" do
     theirs_project = create_copy_of_project(base_project.path, "theirs")
     add_new_subproject_to_project(theirs_project, "foo", "foo")
@@ -100,6 +115,23 @@ describe Kintsugi, :apply_change_to_project do
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
 
+  it "raises if adding subproject whose file reference isn't found" do
+    ours_project = create_copy_of_project(base_project.path, "ours")
+
+    add_new_subproject_to_project(base_project, "foo", "foo")
+    base_project.save
+
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+    base_project.root_object.project_references.pop
+
+    changes_to_apply = get_diff(theirs_project, base_project)
+
+    expect {
+      described_class.apply_change_to_project(ours_project, changes_to_apply)
+    }.to raise_error(Kintsugi::MergeError)
+  end
+
   describe "file related changes" do
     let(:filepath) { "foo" }
 
@@ -370,6 +402,19 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
 
+    it "adds package product dependency to target" do
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.targets[0].package_product_dependencies <<
+        create_swift_package_product_dependency(theirs_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
+
     it "changes framework from reference proxy to file reference" do
       framework_filename = "baz"
 
@@ -382,7 +427,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)
@@ -390,6 +436,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)
+      # 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"
       base_project.save
 
       expect(base_project).to be_equivalent_to_project(theirs_project)
@@ -466,9 +516,28 @@ describe Kintsugi, :apply_change_to_project do
       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
-      file_reference = base_project.main_group.new_reference("bar")
-      base_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
+    it "adds product ref to build file" do
+      base_project.main_group.new_reference("bar")
+      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)
+      build_file.product_ref =
+        create_swift_package_product_dependency(theirs_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, ignore_keys: ["containerPortal"])
+    end
+
+    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")
 
@@ -557,69 +626,427 @@ describe Kintsugi, :apply_change_to_project do
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
 
-    it "adds new build setting" do
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+    describe "build settings" do
+      it "adds new string build setting" do
+        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"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "$(SRCROOT)/../Bar"
+        end
+
+        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
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds new array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {}
+        end
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      expect(base_project).to be_equivalent_to_project(theirs_project)
-    end
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
 
-    it "adds values to existing build setting" do
-      base_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../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
 
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      it "adds new hash build setting" do
+        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"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
+
+        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
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds values to existing array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo"
+          ]
+        end
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      expect(base_project).to be_equivalent_to_project(theirs_project)
-    end
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../Bar"
+          ]
+        end
 
-    it "removes build setting" do
-      base_project.targets[0].build_configurations.each do |configuration|
-        configuration.build_settings["HEADER_SEARCH_PATHS"] = [
-          "$(SRCROOT)/../Foo",
-          "$(SRCROOT)/../Bar"
-        ]
+        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
 
-      base_project.save
-      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      it "adds array value to an existing string if no removed value" do
+        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
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
+        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"] = "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|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo baz]
+        end
+        expect(ours_project).to be_equivalent_to_project(expected_project)
       end
 
-      changes_to_apply = get_diff(theirs_project, base_project)
+      it "adds string value to existing array value if no removed value" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-      described_class.apply_change_to_project(base_project, changes_to_apply)
-      base_project.save
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
 
-      expect(base_project).to be_equivalent_to_project(theirs_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
+
+        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|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo baz]
+        end
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "removes array build setting" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = [
+            "$(SRCROOT)/../Foo",
+            "$(SRCROOT)/../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["HEADER_SEARCH_PATHS"] = nil
+        end
+
+        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 string build setting" 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 =
+            configuration.build_settings.reject { |key, _| key == "HEADER_SEARCH_PATHS" }
+        end
+
+        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 hash build setting" 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
+        end
+
+        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 hash build setting if removed hash contains the existing hash" do
+        base_project.targets[0].build_configurations.each do |configuration|
+          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
+        end
+
+        ours_project = create_copy_of_project(base_project.path, "theirs")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["foo"] = nil
+        end
+
+        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 value if existing is string and removed is array that contains it" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = ["bar"]
+        end
+
+        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
+
+      it "removes value if removed value is string and existing is array that contains it" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = ["bar"]
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        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
+
+      it "removes value if existing is string and removed is array that contains it among other " \
+          "values" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = nil
+        end
+        expect(base_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "changes to a single string value if removed is string and existing is array that " \
+          "contains it among another value" do
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+        base_project.save
+
+        before_theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "bar"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        described_class.apply_change_to_project(base_project, changes_to_apply)
+        base_project.save
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+        expect(base_project).to be_equivalent_to_project(expected_project)
+      end
+
+      it "changes to string value if change contains removal of existing array" 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.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        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 "changes to array value if change contains removal of existing string" 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["HEADER_SEARCH_PATHS"] = %w[baz foo]
+        end
+
+        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 "changes to array if added value is string and existing is another string and removal is" \
+          "nil for an array build setting" do
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        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, "before_theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar baz]
+        end
+
+        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
+
+      it "raises if added value is string and existing is another string and removal is nil for a " \
+          "string build setting" do
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "bar"
+        end
+        base_project.save
+
+        theirs_project = create_copy_of_project(base_project.path, "before_theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "baz"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        expect {
+          described_class.apply_change_to_project(base_project, changes_to_apply)
+        }.to raise_error(Kintsugi::MergeError)
+      end
+
+      it "raises if trying to remove hash entry whose value changed" 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
+        end
+
+        base_project.save
+        before_theirs_project = create_copy_of_project(base_project.path, "theirs")
+        before_theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
+        end
+
+        changes_to_apply = get_diff(theirs_project, before_theirs_project)
+
+        expect {
+          described_class.apply_change_to_project(base_project, changes_to_apply)
+        }.to raise_error(Kintsugi::MergeError)
+      end
     end
 
     it "adds build phases" do
@@ -640,6 +1067,20 @@ describe Kintsugi, :apply_change_to_project do
       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)
+      base_project.save
+
+      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")
 
@@ -752,7 +1193,7 @@ describe Kintsugi, :apply_change_to_project do
     base_project.save
     theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-    theirs_project.root_object.known_regions += ["en"]
+    theirs_project.root_object.known_regions += ["fr"]
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
@@ -763,12 +1204,9 @@ describe Kintsugi, :apply_change_to_project do
   end
 
   it "removes known regions" do
-    base_project.root_object.known_regions += ["en"]
-
-    base_project.save
     theirs_project = create_copy_of_project(base_project.path, "theirs")
 
-    theirs_project.root_object.known_regions = []
+    theirs_project.root_object.known_regions = nil
 
     changes_to_apply = get_diff(theirs_project, base_project)
 
@@ -927,6 +1365,41 @@ describe Kintsugi, :apply_change_to_project do
     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
+
   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)
@@ -934,7 +1407,15 @@ describe Kintsugi, :apply_change_to_project do
   end
 
   def get_diff(first_project, second_project)
-    Xcodeproj::Differ.project_diff(first_project, second_project, :added, :removed)
+    diff = Xcodeproj::Differ.project_diff(first_project, second_project, :added, :removed)
+
+    diff_without_display_name =
+      diff.merge("rootObject" => diff["rootObject"].reject { |key, _| key == "displayName" })
+    if diff_without_display_name == {"rootObject" => {}}
+      raise "Diff contains no changes. This probably means the test doesn't check anything."
+    end
+
+    diff
   end
 
   def add_new_subproject_to_project(project, subproject_name, subproject_product_name)
@@ -987,6 +1468,22 @@ describe Kintsugi, :apply_change_to_project do
     reference_proxy
   end
 
+  def create_swift_package_product_dependency(project)
+    product_dependency = project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
+    product_dependency.product_name = "foo"
+    product_dependency.package = create_remote_swift_package_reference(project)
+
+    product_dependency
+  end
+
+  def create_remote_swift_package_reference(project)
+    package_reference = project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
+    package_reference.repositoryURL = "http://foo"
+    package_reference.requirement = {"foo" => "bar"}
+
+    package_reference
+  end
+
   def make_temp_directory(directory_prefix, directory_extension)
     directory_path = Dir.mktmpdir([directory_prefix, directory_extension])
     temporary_directories_paths << directory_path