heroku-api 0.3.15 → 0.3.16

data/.travis.yml

@@ -12,5 +12,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
 
 script: bundle exec rake

data/Rakefile

@@ -16,14 +16,14 @@ task :cache, [:api_key] do |task, args|
     require "#{File.dirname(__FILE__)}/lib/heroku/api"
     heroku = Heroku::API.new(:api_key => args.api_key)
 
-    addons = Heroku::API::OkJson.encode(heroku.get_addons.body)
+    addons = MultiJson.dump(heroku.get_addons.body)
     File.open("#{File.dirname(__FILE__)}/lib/heroku/api/mock/cache/get_addons.json", 'w') do |file|
       file.write(addons)
     end
 
     app_name = "heroku-api-#{Time.now.to_i}"
     app = heroku.post_app('name' => app_name)
-    features = Heroku::API::OkJson.encode(heroku.get_features(app_name).body)
+    features = MultiJson.dump(heroku.get_features(app_name).body)
     File.open("#{File.dirname(__FILE__)}/lib/heroku/api/mock/cache/get_features.json", 'w') do |file|
       file.write(features)
     end
@@ -32,7 +32,7 @@ task :cache, [:api_key] do |task, args|
     user = heroku.get_user.body
     user["email"] = "user@example.com"
     user["id"] = "123456@users.heroku.com"
-    user = Heroku::API::OkJson.encode(user)
+    user = MultiJson.dump(user)
     File.open("#{File.dirname(__FILE__)}/lib/heroku/api/mock/cache/get_user.json", 'w') do |file|
       file.write(user)
     end

data/changelog.txt

@@ -1,7 +1,15 @@
+0.3.16 01/06/2013
+=================
+
+add process types
+use multi_json instead of okjson
+fix for escaping collaborator emails in requests
+loosen excon dependency
+
 0.3.15 11/03/2013
 =================
 
-add get__dyno_types for retrieving process types
+add get_dyno_types for retrieving process types
 
 0.3.14 07/03/2013
 =================

data/heroku-api.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["geemus (Wesley Beary)", "Pedro Belo"]
   s.email       = ["wesley@heroku.com", "pedro@heroku.com"]
   s.homepage    = "http://github.com/heroku/heroku.rb"
+  s.license     = 'MIT'
   s.summary     = %q{Ruby Client for the Heroku API}
   s.description = %q{Ruby Client for the Heroku API}
 
@@ -16,7 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'excon', '~>0.25.1'
+  s.add_runtime_dependency 'excon', '~>0.27'
+  s.add_runtime_dependency 'multi_json', '~>1.8.2'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/lib/heroku/api/collaborators.rb

@@ -6,7 +6,7 @@ module Heroku
       request(
         :expects  => 200,
         :method   => :delete,
-        :path     => "/apps/#{app}/collaborators/#{email}"
+        :path     => "/apps/#{app}/collaborators/#{CGI.escape(email)}"
       )
     end
 

data/lib/heroku/api/config_vars.rb

@@ -22,7 +22,7 @@ module Heroku
     # PUT /apps/:app/config_vars
     def put_config_vars(app, vars)
       request(
-        :body     => Heroku::API::OkJson.encode(vars),
+        :body     => MultiJson.dump(vars),
         :expects  => 200,
         :method   => :put,
         :path     => "/apps/#{app}/config_vars"

data/lib/heroku/api/mock/addons.rb

@@ -14,7 +14,7 @@ module Heroku
               # addon is currently installed
               remove_mock_app_addon(mock_data, app, addon)
               {
-                :body   => Heroku::API::OkJson.encode({
+                :body   => MultiJson.dump({
                   "message" => nil,
                   "price"   => get_mock_addon_price(mock_data, addon),
                   "status"  => 'Uninstalled'
@@ -24,14 +24,14 @@ module Heroku
             else
               # addon is not currently installed
               {
-                :body   => Heroku::API::OkJson.encode({'error' => "The add-on #{addon} is not installed for this app. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
+                :body   => MultiJson.dump({'error' => "The add-on #{addon} is not installed for this app. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API::OkJson.encode({'error' => "Could not find add-on #{addon}. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
+              :body   => MultiJson.dump({'error' => "Could not find add-on #{addon}. Did you mean:\n\t#{addon_names.join("\n\t")}"}),
               :status => 422
             }
           end
@@ -53,7 +53,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:addons][app].map {|addon| addon['configured'] = true; addon}),
+            :body   => MultiJson.dump(mock_data[:addons][app].map {|addon| addon['configured'] = true; addon}),
             :status => 200
           }
         end
@@ -72,7 +72,7 @@ module Heroku
                 # addon is not currently installed
                 add_mock_app_addon(mock_data, app, addon)
                 {
-                  :body   => Heroku::API::OkJson.encode({
+                  :body   => MultiJson.dump({
                     "message" => nil,
                     "price"   => get_mock_addon_price(mock_data, addon),
                     "status"  => 'Installed'
@@ -82,21 +82,21 @@ module Heroku
               else
                 # addon is currently installed
                 {
-                  :body   => Heroku::API::OkJson.encode({'error' => "Add-on already installed."}),
+                  :body   => MultiJson.dump({'error' => "Add-on already installed."}),
                   :status => 422
                 }
               end
             else
               # addon of same type exists
               {
-                :body   => Heroku::API::OkJson.encode({'error' => "#{app_addon_type_data['name']} add-on already added.\nTo upgrade, use addons:upgrade instead.\n"}),
+                :body   => MultiJson.dump({'error' => "#{app_addon_type_data['name']} add-on already added.\nTo upgrade, use addons:upgrade instead.\n"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API::OkJson.encode({'error' => "Add-on not found."}),
+              :body   => MultiJson.dump({'error' => "Add-on not found."}),
               :status => 404
             }
           end
@@ -117,7 +117,7 @@ module Heroku
                 mock_data[:addons][app].delete(app_addon_data)
                 add_mock_app_addon(mock_data, app, addon)
                 {
-                  :body   => Heroku::API::OkJson.encode({
+                  :body   => MultiJson.dump({
                     "message" => 'Plan upgraded',
                     "price"   => get_mock_addon_price(mock_data, addon),
                     "status"  => 'Updated'
@@ -127,21 +127,21 @@ module Heroku
               else
                 # addon is currently installed
                 {
-                  :body   => Heroku::API::OkJson.encode({'error' => "Add-on already installed."}),
+                  :body   => MultiJson.dump({'error' => "Add-on already installed."}),
                   :status => 422
                 }
               end
             else
               # addon of same type not installed
               {
-                :body   => Heroku::API::OkJson.encode({'error' => "Can't upgrade, no #{addon.split(':').join(' ')} add-on has been added.\nTo add, use addons:add instead.\n"}),
+                :body   => MultiJson.dump({'error' => "Can't upgrade, no #{addon.split(':').join(' ')} add-on has been added.\nTo add, use addons:add instead.\n"}),
                 :status => 422
               }
             end
           else
             # addon does not exist
             {
-              :body   => Heroku::API::OkJson.encode({'error' => "Add-on not found."}),
+              :body   => MultiJson.dump({'error' => "Add-on not found."}),
               :status => 404
             }
           end

data/lib/heroku/api/mock/apps.rb

@@ -17,7 +17,7 @@ module Heroku
           mock_data[:ps].delete(app)
           mock_data[:releases].delete(app)
           {
-            :body   => Heroku::API::OkJson.encode({}),
+            :body   => MultiJson.dump({}),
             :status => 200
           }
         end
@@ -27,7 +27,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :get, :path => '/apps') do |params|
         request_params, mock_data = parse_stub_params(params)
         {
-          :body   => Heroku::API::OkJson.encode(mock_data[:apps]),
+          :body   => MultiJson.dump(mock_data[:apps]),
           :status => 200
         }
       end
@@ -38,7 +38,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API::OkJson.encode(app_data),
+            :body   => MultiJson.dump(app_data),
             :status => 200
           }
         end
@@ -52,7 +52,7 @@ module Heroku
         with_mock_app(mock_data, app) do
           maintenance = mock_data[:maintenance_mode].include?(app)
           {
-            :body   => Heroku::API::OkJson.encode('maintenance' => maintenance),
+            :body   => MultiJson.dump('maintenance' => maintenance),
             :status => 200
           }
         end
@@ -65,7 +65,7 @@ module Heroku
 
         if get_mock_app(mock_data, app)
           {
-            :body => Heroku::API::OkJson.encode('error' => 'Name is already taken'),
+            :body => MultiJson.dump('error' => 'Name is already taken'),
             :status => 422
           }
         else
@@ -130,7 +130,7 @@ module Heroku
           end
 
           {
-            :body   => Heroku::API::OkJson.encode(app_data),
+            :body   => MultiJson.dump(app_data),
             :status => 202
           }
         end
@@ -175,12 +175,12 @@ module Heroku
           end
           if email && !collaborator
             {
-              :body   => Heroku::API::OkJson.encode('error' => 'Only existing collaborators can receive ownership for an app'),
+              :body   => MultiJson.dump('error' => 'Only existing collaborators can receive ownership for an app'),
               :status => 422
             }
           else
             {
-              :body   => Heroku::API::OkJson.encode('name' => app_data['name']),
+              :body   => MultiJson.dump('name' => app_data['name']),
               :status => 200
             }
           end
@@ -194,7 +194,7 @@ module Heroku
 
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API::OkJson.encode({}),
+            :body   => MultiJson.dump({}),
             :status => 201
           }
         end

data/lib/heroku/api/mock/attachments.rb

@@ -8,7 +8,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:attachments][app]),
+            :body   => MultiJson.dump(mock_data[:attachments][app]),
             :status => 200
           }
         end

data/lib/heroku/api/mock/collaborators.rb

@@ -6,6 +6,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :delete, :path => %r{^/apps/([^/]+)/collaborators/([^/]+)$}) do |params|
         request_params, mock_data = parse_stub_params(params)
         app, email, _ = request_params[:captures][:path]
+        email = CGI.unescape(email)
         with_mock_app(mock_data, app) do
           if collaborator_data = get_mock_collaborator(mock_data, app, email)
             mock_data[:collaborators][app].delete(collaborator_data)
@@ -25,7 +26,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:collaborators][app]),
+            :body   => MultiJson.dump(mock_data[:collaborators][app]),
             :status => 200
           }
         end

data/lib/heroku/api/mock/config_vars.rb

@@ -11,7 +11,7 @@ module Heroku
           mock_data[:config_vars][app].delete(key)
           add_mock_release(mock_data, app, {'descr' => "Config remove #{key}"})
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
+            :body   => MultiJson.dump(mock_data[:config_vars][app]),
             :status => 200
           }
         end
@@ -23,7 +23,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
+            :body   => MultiJson.dump(mock_data[:config_vars][app]),
             :status => 200
           }
         end
@@ -38,7 +38,7 @@ module Heroku
           mock_data[:config_vars][app].merge!(new_config_vars)
           add_mock_release(mock_data, app, {'descr' => "Config add #{new_config_vars.keys.join(', ')}"})
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:config_vars][app]),
+            :body   => MultiJson.dump(mock_data[:config_vars][app]),
             :status => 200
           }
         end

data/lib/heroku/api/mock/domains.rb

@@ -45,7 +45,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:domains][app]),
+            :body   => MultiJson.dump(mock_data[:domains][app]),
             :status => 200
           }
         end
@@ -69,7 +69,7 @@ module Heroku
             }
           end
           {
-            :body   => Heroku::API::OkJson.encode('domain' => domain),
+            :body   => MultiJson.dump('domain' => domain),
             :status => 201
           }
         end

data/lib/heroku/api/mock/features.rb

@@ -16,20 +16,20 @@ module Heroku
             when 'app'
               mock_data[:features][:app][app].delete(feature_data)
               {
-                :body   => Heroku::API::OkJson.encode(feature_data.merge('enabled' => false)),
+                :body   => MultiJson.dump(feature_data.merge('enabled' => false)),
                 :status => 200
               }
             when 'user'
               mock_data[:features][:user].delete(feature_data.merge('enabled' => false))
               {
-                :body   => Heroku::API::OkJson.encode(feature_data),
+                :body   => MultiJson.dump(feature_data),
                 :status => 200
               }
             end
           else
             # feature does not exist
             {
-              :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
+              :body   => MultiJson.dump({'error' => "Feature not found."}),
               :status => 404
             }
           end
@@ -56,13 +56,13 @@ module Heroku
         feature, _ = request_params[:captures][:path]
         if feature_data = get_mock_feature(mock_data, feature)
           {
-            :body   => Heroku::API::OkJson.encode(feature_data),
+            :body   => MultiJson.dump(feature_data),
             :status => 200
           }
         else
           # feature does not exist
           {
-            :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
+            :body   => MultiJson.dump({'error' => "Feature not found."}),
             :status => 404
           }
         end
@@ -87,7 +87,7 @@ module Heroku
                 201
               end
               {
-                :body   => Heroku::API::OkJson.encode(feature_data),
+                :body   => MultiJson.dump(feature_data),
                 :status => status
               }
             when 'user'
@@ -105,7 +105,7 @@ module Heroku
           else
             # feature does not exist
             {
-              :body   => Heroku::API::OkJson.encode({'error' => "Feature not found."}),
+              :body   => MultiJson.dump({'error' => "Feature not found."}),
               :status => 404
             }
           end

data/lib/heroku/api/mock/keys.rb

@@ -26,7 +26,7 @@ module Heroku
       Excon.stub(:expects => 200, :method => :get, :path => %r{^/user/keys}) do |params|
         request_params, mock_data = parse_stub_params(params)
         {
-          :body   => Heroku::API::OkJson.encode(mock_data[:keys]),
+          :body   => MultiJson.dump(mock_data[:keys]),
           :status => 200
         }
       end

data/lib/heroku/api/mock/processes.rb

@@ -8,7 +8,7 @@ module Heroku
       app, _ = request_params[:captures][:path]
       with_mock_app(mock_data, app) do |app_data|
         {
-          :body   => Heroku::API::OkJson.encode(get_mock_processes(mock_data, app)),
+          :body   => MultiJson.dump(get_mock_processes(mock_data, app)),
           :status => 200
         }
       end
@@ -43,7 +43,7 @@ module Heroku
         }
         mock_data[:ps][app] << data
         {
-          :body   => Heroku::API::OkJson.encode(data),
+          :body   => MultiJson.dump(data),
           :status => 200,
         }
       end
@@ -117,13 +117,13 @@ module Heroku
             }
           else
             {
-              :body   => Heroku::API::OkJson.encode('error' => "No such type as #{type}") ,
+              :body   => MultiJson.dump('error' => "No such type as #{type}") ,
               :status => 422
             }
           end
         else
           {
-            :body   => Heroku::API::OkJson.encode('error' => "That feature is not available on this app's stack"),
+            :body   => MultiJson.dump('error' => "That feature is not available on this app's stack"),
             :status => 422
           }
         end
@@ -139,7 +139,7 @@ module Heroku
         type  = request_params[:query].has_key?('type') && request_params[:query]['type']
         if !ps && !type
           {
-            :body   => Heroku::API::OkJson.encode({'error' => 'Missing process argument'}),
+            :body   => MultiJson.dump({'error' => 'Missing process argument'}),
             :status => 422
           }
         else
@@ -160,12 +160,12 @@ module Heroku
         unless app_data['stack'] == 'cedar'
           app_data['dynos'] = dynos
           {
-            :body   => Heroku::API::OkJson.encode({'name' => app, 'dynos' => dynos}),
+            :body   => MultiJson.dump({'name' => app, 'dynos' => dynos}),
             :status => 200
           }
         else
           {
-            :body   => Heroku::API::OkJson.encode({'error' => "For Cedar apps, use `heroku scale web=#{dynos}`"}),
+            :body   => MultiJson.dump({'error' => "For Cedar apps, use `heroku scale web=#{dynos}`"}),
             :status => 422
           }
         end
@@ -181,12 +181,12 @@ module Heroku
         unless app_data['stack'] == 'cedar'
           app_data['workers'] = workers
           {
-            :body   => Heroku::API::OkJson.encode({'name' => app, 'workers' => workers}),
+            :body   => MultiJson.dump({'name' => app, 'workers' => workers}),
             :status => 200
           }
         else
           {
-            :body   => Heroku::API::OkJson.encode({'error' => "For Cedar apps, use `heroku scale worker=#{workers}`"}),
+            :body   => MultiJson.dump({'error' => "For Cedar apps, use `heroku scale worker=#{workers}`"}),
             :status => 422
           }
         end
@@ -203,7 +203,7 @@ module Heroku
         size = new_resize_vars[process]["size"][/(\d+)/]
         mock_data[:ps][app].first.merge!({'size' => size})
         {
-          :body   => Heroku::API::OkJson.encode(get_mock_processes(mock_data, app)),
+          :body   => MultiJson.dump(get_mock_processes(mock_data, app)),
           :status => 200
         }
       end
@@ -215,7 +215,7 @@ module Heroku
       app, _ = request_params[:captures][:path]
       with_mock_app(mock_data, app) do |app_data|
         {
-          :body   => Heroku::API::OkJson.encode([{"command"=>"bundle exec rails console", "name"=>"console", "quantity"=>0}]),
+          :body   => MultiJson.dump([{"command"=>"bundle exec rails console", "name"=>"console", "quantity"=>0}]),
           :status => 200
         }
       end

data/lib/heroku/api/mock/releases.rb

@@ -8,7 +8,7 @@ module Heroku
         app, _ = request_params[:captures][:path]
         with_mock_app(mock_data, app) do |app_data|
           {
-            :body   => Heroku::API::OkJson.encode(mock_data[:releases][app]),
+            :body   => MultiJson.dump(mock_data[:releases][app]),
             :status => 200
           }
         end
@@ -22,7 +22,7 @@ module Heroku
           releases = mock_data[:releases][app]
           if release_data = (release_name == 'current' && releases.last) || releases.detect {|release| release['name'] == release_name}
             {
-              :body   => Heroku::API::OkJson.encode(release_data),
+              :body   => MultiJson.dump(release_data),
               :status => 200
             }
           else
@@ -51,7 +51,7 @@ module Heroku
               }
             else
               {
-                :body   => Heroku::API::OkJson.encode({'error' => 'Cannot rollback to a release that had a different set of addons installed'}),
+                :body   => MultiJson.dump({'error' => 'Cannot rollback to a release that had a different set of addons installed'}),
                 :status => 422
               }
             end

data/lib/heroku/api/mock/stacks.rb

@@ -37,7 +37,7 @@ module Heroku
           stack_data = Marshal::load(Marshal.dump(STACKS))
           stack_data.detect {|stack| stack['name'] == app_data['stack']}['current'] = true
           {
-            :body   => Heroku::API::OkJson.encode(stack_data),
+            :body   => MultiJson.dump(stack_data),
             :status => 200
           }
         end
@@ -65,13 +65,13 @@ BODY
               }
             else
               {
-                :body   => Heroku::API::OkJson.encode('error' => 'Stack not found'),
+                :body   => MultiJson.dump('error' => 'Stack not found'),
                 :status => 404
               }
             end
           else
             {
-              :body   => Heroku::API::OkJson.encode('error' => 'Stack migration to/from Cedar is not available. Create a new app with --stack cedar instead.'),
+              :body   => MultiJson.dump('error' => 'Stack migration to/from Cedar is not available. Create a new app with --stack cedar instead.'),
               :status => 422
             }
           end

data/lib/heroku/api/mock.rb

@@ -73,7 +73,7 @@ module Heroku
       def self.get_mock_addon(mock_data, addon)
         @addons ||= begin
           data = File.read("#{File.dirname(__FILE__)}/mock/cache/get_addons.json")
-          Heroku::API::OkJson.decode(data)
+          MultiJson.load(data)
         end
         @addons.detect {|addon_data| addon_data['name'] == addon}
       end
@@ -107,7 +107,7 @@ module Heroku
       def self.get_mock_feature(mock_data, feature)
         @features ||= begin
           data = File.read("#{File.dirname(__FILE__)}/mock/cache/get_features.json")
-          Heroku::API::OkJson.decode(data)
+          MultiJson.load(data)
         end
         @features.detect {|feature_data| feature_data['name'] == feature}
       end
@@ -143,7 +143,7 @@ module Heroku
 
           parsed = params.dup
           begin # try to JSON decode
-            parsed[:body] &&= Heroku::API::OkJson.decode(parsed[:body])
+            parsed[:body] &&= MultiJson.load(parsed[:body])
           rescue # else leave as is
           end
           mock_data = @mock_data[api_key]

data/lib/heroku/api/processes.rb

@@ -78,7 +78,7 @@ module Heroku
     def put_formation(app, options)
       options.each { |process, size| options[process] = {'size' => size} }
       request(
-        :body     => Heroku::API::OkJson.encode(options),
+        :body     => MultiJson.dump(options),
         :expects  => 200,
         :method   => :put,
         :path     => "/apps/#{app}/formation"

data/lib/heroku/api/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   class API
-    VERSION = "0.3.15"
+    VERSION = "0.3.16"
   end
 end

data/lib/heroku/api.rb

@@ -1,5 +1,7 @@
 require "base64"
+require "cgi"
 require "excon"
+require "multi_json"
 require "securerandom"
 require "uri"
 require "zlib"
@@ -9,8 +11,6 @@ unless $LOAD_PATH.include?(__LIB_DIR__)
   $LOAD_PATH.unshift(__LIB_DIR__)
 end
 
-require "heroku/api/vendor/okjson"
-
 require "heroku/api/errors"
 require "heroku/api/mock"
 require "heroku/api/version"
@@ -102,7 +102,7 @@ module Heroku
       if response.body && !response.body.empty?
         decompress_response!(response)
         begin
-          response.body = Heroku::API::OkJson.decode(response.body)
+          response.body = MultiJson.load(response.body)
         rescue
           # leave non-JSON body as is
         end

data/test/test_addons.rb

@@ -43,7 +43,7 @@ class TestAddons < Minitest::Test
     data = File.read("#{File.dirname(__FILE__)}/../lib/heroku/api/mock/cache/get_addons.json")
 
     assert_equal(200, response.status)
-    assert_equal(Heroku::API::OkJson.decode(data), response.body)
+    assert_equal(MultiJson.load(data), response.body)
   end
 
   def test_get_addons_with_app

data/test/test_collaborators.rb

@@ -70,4 +70,19 @@ class TestCollaborators < Minitest::Test
     end
   end
 
+  def test_delete_collaborator
+    with_app do |app_data|
+      email_address = 'wesley+test@heroku.com'
+      heroku.post_collaborator(app_data['name'], email_address)
+
+      response = heroku.delete_collaborator(app_data['name'], email_address)
+
+      assert_equal(200, response.status)
+      assert_equal(
+        "#{email_address} has been removed as collaborator on #{app_data['name']}",
+        response.body
+      )
+    end
+  end
+
 end