Merge pull request #2079 from jbence/CHEF-2065

Use exact match to locate remote git-reference

1 files changed, 46 insertions, 0 deletions

diff --git a/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb
index ff1c0b0398..02d155efbd 100644
--- a/spec/unit/provider/git_spec.rb
+++ b/spec/unit/provider/git_spec.rb
@@ -106,6 +106,52 @@ describe Chef::Provider::Git do
       @provider.target_revision.should eql("663c22a5e41f5ae3193460cca044ed1435029f53")
     end
 
+    it "converts resource.revision from a tag to a SHA using an exact match" do
+      @resource.revision "v1.0"
+      @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
+                 "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/releases/v1.0\n" +
+                 "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/v1.0\n")
+      @provider.should_receive(:shell_out!).with(@git_ls_remote + "\"v1.0*\"", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
+      @provider.target_revision.should eql("503c22a5e41f5ae3193460cca044ed1435029f53")
+    end
+
+    it "converts resource.revision from a tag to a SHA, matching tags first, then heads" do
+      @resource.revision "v1.0"
+      @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
+          "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/v1.0\n" +
+          "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n")
+      @provider.should_receive(:shell_out!).with(@git_ls_remote + "\"v1.0*\"", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
+      @provider.target_revision.should eql("663c22a5e41f5ae3193460cca044ed1435029f53")
+    end
+
+    it "converts resource.revision from a tag to a SHA, matching heads if no tags match" do
+      @resource.revision "v1.0"
+      @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
+          "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/v1.1\n" +
+          "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n")
+      @provider.should_receive(:shell_out!).with(@git_ls_remote + "\"v1.0*\"", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
+      @provider.target_revision.should eql("503c22a5e41f5ae3193460cca044ed1435029f53")
+    end
+
+    it "converts resource.revision from a tag to a SHA, matching tags first, then heads, then revision" do
+      @resource.revision "refs/pulls/v1.0"
+      @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
+          "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/v1.0\n" +
+          "805c22a5e41f5ae3193460cca044ed1435029f53\trefs/pulls/v1.0\n" +
+          "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n")
+      @provider.should_receive(:shell_out!).with(@git_ls_remote + "\"refs/pulls/v1.0*\"", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
+      @provider.target_revision.should eql("805c22a5e41f5ae3193460cca044ed1435029f53")
+    end
+
+    it "converts resource.revision from a tag to a SHA, using full path if provided" do
+      @resource.revision "refs/heads/v1.0"
+      @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
+          "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/tags/v1.0\n" +
+          "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n")
+      @provider.should_receive(:shell_out!).with(@git_ls_remote + "\"refs/heads/v1.0*\"", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
+      @provider.target_revision.should eql("503c22a5e41f5ae3193460cca044ed1435029f53")
+    end
+
     it "raises an invalid remote reference error if you try to deploy from ``origin'' and assertions are run" do
       @resource.revision "origin/"
       @provider.action = :checkout