provide test for failed git clone

jtarchie · jtarchie · commit b21df8991c36 · 2016-02-29T14:43:12.000-05:00
diff --git a/assets/lib/in.rb b/assets/lib/in.rb
@@ -21,7 +21,7 @@ def ref
 
 system("git clone --depth 1 #{uri} #{destination} 1>&2")
 
-fail 'git clone failed' unless $?.exitstatus == 0
+raise 'git clone failed' unless $CHILD_STATUS.exitstatus == 0
 
 Dir.chdir(destination) do
   system('git submodule update --init --recursive 1>&2')
diff --git a/assets/lib/out.rb b/assets/lib/out.rb
@@ -17,8 +17,6 @@
 id  = Dir.chdir(path) { `git config --get pullrequest.id`.chomp }
 sha = Dir.chdir(path) { `git rev-parse HEAD`.chomp }
 
-fail 'could not get pullrequest `id` from repository' unless id
-
 repo = Repository.new(name: input['source']['repo'])
 
 metadata = [{ name: 'status', value: input['params']['status'] }]
diff --git a/spec/integration/in_spec.rb b/spec/integration/in_spec.rb
@@ -38,7 +38,7 @@ def commit(msg)
   end
 
   it 'returns the correct JSON metadata' do
-    output = get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' })
+    output, = get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' })
     expect(output).to eq('version'  => { 'ref' => @ref, 'pr' => '1' },
                          'metadata' => [{
                            'name' => 'url',
@@ -59,4 +59,11 @@ def commit(msg)
     value = git('rev-parse --abbrev-ref HEAD', dest_dir)
     expect(value).to eq 'pr-1'
   end
+
+  context 'when the git clone fails' do
+    it 'provides a helpful erorr message' do
+      _, error = get(version: { ref: @ref, pr: '1' }, source: { uri: 'invalid_git_uri', repo: 'jtarchie/test' })
+      expect(error).to include 'git clone failed'
+    end
+  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -29,8 +29,14 @@ def get(payload = {})
   path = ['./assets/in', '/opt/resource/in'].find { |p| File.exist? p }
   payload[:source][:no_ssl_verify] = true
 
-  output = `echo '#{JSON.generate(payload)}' | env http_proxy=#{proxy.url} #{path} #{dest_dir}`
-  JSON.parse(output)
+  output, error, = with_resource do |_dir|
+    Open3.capture3("echo '#{JSON.generate(payload)}' | env http_proxy=#{proxy.url} #{path} #{dest_dir}")
+  end
+  [(begin
+      JSON.parse(output)
+    rescue
+      nil
+    end), error]
 end
 
 def put(payload = {})
