Tests for line endings and removed some apparently unnecessary code

Author: jdee

lib/fastlane/plugin/patch/helper/patch_helper.rb

@@ -51,21 +51,9 @@ def revert_patch(contents, regexp, text, global, mode, offset)
           patched_regexp =
             case mode
             when :append
-              suffix = ""
-              if regexp_string.end_with? "$"
-                suffix = "\n"
-                regexp_string.sub!(/\$$/, "")
-              end
-
-              /#{regexp_string}#{Regexp.quote(text)}#{suffix}/m
+              /#{regexp_string}#{Regexp.quote(text)}/m
             when :prepend
-              prefix = ""
-              if regexp_string.start_with? "^"
-                prefix = "\n"
-                regexp_string.sub!(/^\^/, "")
-              end
-
-              /#{prefix}#{Regexp.quote(text)}#{regexp_string}/m
+              /#{Regexp.quote(text)}#{regexp_string}/m
             else
               raise ArgumentError, "Invalid mode argument. Specify :append or :prepend."
             end

spec/patch_helper_spec.rb

@@ -2,50 +2,82 @@
   let (:helper) { Fastlane::Helper::PatchHelper }
 
   describe 'apply_patch' do
-    it 'inserts text after a pattern in :append mode' do
-      original = 'alpha beta gamma'
-      modified = helper.apply_patch original, /beta/, ' beta and a half', false, :append, 0
-      expect(modified).to eq 'alpha beta beta and a half gamma'
-    end
+    describe 'modes' do
+      it 'inserts text after a pattern in :append mode' do
+        original = 'alpha beta gamma'
+        modified = helper.apply_patch original, /beta/, ' beta and a half', false, :append, 0
+        expect(modified).to eq 'alpha beta beta and a half gamma'
+      end
 
-    it 'inserts text before a pattern in :prepend mode' do
-      original = 'alpha beta gamma'
-      modified = helper.apply_patch original, /beta/, 'alpha and a half ', false, :prepend, 0
-      expect(modified).to eq 'alpha alpha and a half beta gamma'
-    end
+      it 'inserts text before a pattern in :prepend mode' do
+        original = 'alpha beta gamma'
+        modified = helper.apply_patch original, /beta/, 'alpha and a half ', false, :prepend, 0
+        expect(modified).to eq 'alpha alpha and a half beta gamma'
+      end
 
-    it 'replaces a pattern with text in :replace mode' do
-      original = 'alpha beta gamma'
-      modified = helper.apply_patch original, /beta/, 'two', false, :replace, 0
-      expect(modified).to eq 'alpha two gamma'
+      it 'replaces a pattern with text in :replace mode' do
+        original = 'alpha beta gamma'
+        modified = helper.apply_patch original, /beta/, 'two', false, :replace, 0
+        expect(modified).to eq 'alpha two gamma'
+      end
+
+      it 'raises for any other mode' do
+        original = 'alpha beta gamma'
+        expect do
+          helper.apply_patch original, /beta/, ' beta and a half', false, :add_somewhere_i_dont_know_where, 0
+        end.to raise_error ArgumentError
+      end
     end
 
-    it 'raises for any other mode' do
-      original = 'alpha beta gamma'
-      expect do
-        helper.apply_patch original, /beta/, ' beta and a half', false, :add_somewhere_i_dont_know_where, 0
-      end.to raise_error ArgumentError
+    describe 'line endings' do
+      it 'handles things at the end of a line' do
+        original = "alpha\nbeta\ngamma\n"
+        modified = helper.apply_patch original, /beta$/, "\nbeta and a half", false, :append, 0
+        expect(modified).to eq "alpha\nbeta\nbeta and a half\ngamma\n"
+      end
+
+      it 'handles things at the beginning of a line' do
+        original = "alpha\nbeta\ngamma\n"
+        modified = helper.apply_patch original, /^beta/, "alpha and a half\n", false, :prepend, 0
+        expect(modified).to eq "alpha\nalpha and a half\nbeta\ngamma\n"
+      end
     end
   end
 
   describe 'revert_patch' do
-    it 'removes a patch applied in :append mode' do
-      original = 'alpha beta beta and a half gamma'
-      modified = helper.revert_patch original, /beta/, ' beta and a half', false, :append, 0
-      expect(modified).to eq 'alpha beta gamma'
-    end
+    describe 'modes' do
+      it 'removes a patch applied in :append mode' do
+        original = 'alpha beta beta and a half gamma'
+        modified = helper.revert_patch original, /beta/, ' beta and a half', false, :append, 0
+        expect(modified).to eq 'alpha beta gamma'
+      end
+
+      it 'reverts a patch applied in :prepend mode' do
+        original = 'alpha alpha and a half beta gamma'
+        modified = helper.revert_patch original, /beta/, 'alpha and a half ', false, :prepend, 0
+        expect(modified).to eq 'alpha beta gamma'
+      end
 
-    it 'reverts a patch applied in :prepend mode' do
-      original = 'alpha alpha and a half beta gamma'
-      modified = helper.revert_patch original, /beta/, 'alpha and a half ', false, :prepend, 0
-      expect(modified).to eq 'alpha beta gamma'
+      it 'raises if :replace mode specified' do
+        original = 'alpha two gamma'
+        expect do
+          helper.revert_patch original, /beta/, 'two', false, :replace, 0
+        end.to raise_error ArgumentError
+      end
     end
 
-    it 'raises if :replace mode specified' do
-      original = 'alpha two gamma'
-      expect do
-        helper.revert_patch original, /beta/, 'two', false, :replace, 0
-      end.to raise_error ArgumentError
+    describe 'line endings' do
+      it 'handles things at the end of a line' do
+        original = "alpha\nbeta\nbeta and a half\ngamma\n"
+        modified = helper.revert_patch original, /beta$/, "\nbeta and a half", false, :append, 0
+        expect(modified).to eq "alpha\nbeta\ngamma\n"
+      end
+
+      it 'handles things at the beginning of a line' do
+        original = "alpha\nalpha and a half\nbeta\ngamma\n"
+        modified = helper.revert_patch original, /^beta/, "alpha and a half\n", false, :prepend, 0
+        expect(modified).to eq "alpha\nbeta\ngamma\n"
+      end
     end
   end
 end