heroku_spec.rb in dpl-heroku-1.10.5.travis.3089.5

- old
+ new

@@ -9,11 +9,11 @@
     Faraday.new do |builder|
       builder.adapter :test, stubs do |stub|
         stub.get("/account") {|env| [200, response_headers, account_response_body]}
         stub.get("/apps/example") {|env| [200, response_headers, app_response_body]}
         stub.post("/apps/example/builds") {|env| [201, response_headers, builds_response_body]}
-        stub.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body]}
+        stub.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body]}
         stub.post("/sources") {|env| [201, response_headers, source_response_body] }
         stub.post("/apps/example/dynos") {|env| [201, response_headers, dynos_create_response_body]}
         stub.delete("/apps/example/dynos") {|env| [202, response_headers, '{}'] }
       end
     end
@@ -161,57 +161,31 @@
       "type": "run",
       "updated_at": "2012-01-01T12:00:00Z"
     }'
   }
 
-  let(:build_result_response_body) {
+  let(:build_response_body) {
   '{
-      "build": {
-      "id": "01234567-89ab-cdef-0123-456789abcdef",
-      "status": "succeeded",
-      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-    },
-    "exit_code": 0,
-    "lines": [
-      {
-        "line": "-----> Ruby app detected\n",
-        "stream": "STDOUT"
-      }
-    ]
+    "id": "01234567-89ab-cdef-0123-456789abcdef",
+    "status": "succeeded",
+    "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
   }'
   }
 
-  let(:build_result_response_body_failure) {
+  let(:build_response_body_failure) {
     '{
-        "build": {
-        "id": "01234567-89ab-cdef-0123-456789abcdef",
-        "status": "failed",
-        "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-      },
-      "exit_code": 1,
-      "lines": [
-        {
-          "line": "-----> Ruby app detected\n",
-          "stream": "STDOUT"
-        }
-      ]
+      "id": "01234567-89ab-cdef-0123-456789abcdef",
+      "status": "failed",
+      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
     }'
   }
 
-  let(:build_result_response_body_in_progress) {
+  let(:build_response_body_in_progress) {
     '{
-        "build": {
-        "id": "01234567-89ab-cdef-0123-456789abcdef",
-        "status": "failed",
-        "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
-      },
-      "lines": [
-        {
-          "line": "-----> Ruby app detected\n",
-          "stream": "STDOUT"
-        }
-      ]
+      "id": "01234567-89ab-cdef-0123-456789abcdef",
+      "status": "pending",
+      "output_stream_url": "https://build-output.heroku.com/streams/01234567-89ab-cdef-0123-456789abcdef"
     }'
   }
 end
 
 describe DPL::Provider::Heroku, :api do
@@ -296,19 +270,19 @@
 
     context 'when build fails' do
       example do
         expect(provider).to receive(:faraday).at_least(:once).and_return(faraday)
         expect(provider).to receive(:build_id).at_least(:once).and_return('01234567-89ab-cdef-0123-456789abcdef')
-        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body_failure]}
-        expect{ provider.verify_build }.to raise_error("deploy failed, build exited with code 1")
+        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body_failure]}
+        expect{ provider.verify_build }.to raise_error("deploy failed")
       end
     end
 
     context 'when build is pending, then succeeds' do
       example do
         expect(provider).to receive(:faraday).at_least(:once).and_return(faraday)
         expect(provider).to receive(:build_id).at_least(:once).and_return('01234567-89ab-cdef-0123-456789abcdef')
-        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef/result") {|env| [200, response_headers, build_result_response_body_in_progress]}
+        stubs.get("/apps/example/builds/01234567-89ab-cdef-0123-456789abcdef") {|env| [200, response_headers, build_response_body_in_progress]}
         expect(provider).to receive(:sleep).with(5).and_return(true)
         expect{ provider.verify_build }.not_to raise_error
       end
     end
 