diff --git a/spec/cli/droplets_cli_spec.rb b/spec/cli/droplets_cli_spec.rb index 7e789d8..67184f4 100644 --- a/spec/cli/droplets_cli_spec.rb +++ b/spec/cli/droplets_cli_spec.rb @@ -14,9 +14,9 @@ to_return(status: 200, body: fixture('show_droplets'), headers: { 'Content-Type' => 'application/json' }) expected_string = <<-eos -example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990) -example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956) -example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444) +example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990) +example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956) +example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444) eos expect { cli.droplets }.to output(expected_string).to_stdout @@ -34,10 +34,11 @@ with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }). to_return(status: 200, body: fixture('show_droplets_private_ip'), headers: { 'Content-Type' => 'application/json' }) + expected_string = <<-eos -exampleprivate.com (ip: 104.236.32.182, private_ip: 10.131.99.89, status: \e[32mactive\e[0m, region: nyc3, id: 6918990) -example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956) -example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444) +exampleprivate.com (ip: 104.236.32.182, private_ip: 10.131.99.89, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990) +example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956) +example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444) eos expect { cli.droplets }.to output(expected_string).to_stdout @@ -94,9 +95,9 @@ cli.options = cli.options.merge('include_urls' => true) expected_string = <<-eos -example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990') -example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956') -example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444') +example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990') +example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956') +example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444') eos expect { cli.droplets }.to output(expected_string).to_stdout @@ -118,15 +119,16 @@ with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }). to_return(status: 200, body: fixture('show_droplets_paginated_last'), headers: { 'Content-Type' => 'application/json' }) + cli.options = cli.options.merge('per_page' => '3') expected_string = <<-eos -page1example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990) -page1example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956) -page1example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444) -page2example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990) -page2example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956) -page2example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444) +page1example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990') +page1example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956') +page1example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444') +page2example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990') +page2example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956') +page2example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444') eos expect { cli.droplets }.to output(expected_string).to_stdout diff --git a/spec/fixtures/show_droplets.json b/spec/fixtures/show_droplets.json index ce164c5..26509f7 100644 --- a/spec/fixtures/show_droplets.json +++ b/spec/fixtures/show_droplets.json @@ -79,7 +79,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164956, @@ -160,7 +161,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164444, @@ -241,7 +243,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} } ], "links": { @@ -249,4 +252,4 @@ "meta": { "total": 4 } -} \ No newline at end of file +} diff --git a/spec/fixtures/show_droplets_paginated_first.json b/spec/fixtures/show_droplets_paginated_first.json index c036f64..6f92a2f 100644 --- a/spec/fixtures/show_droplets_paginated_first.json +++ b/spec/fixtures/show_droplets_paginated_first.json @@ -79,7 +79,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164956, @@ -160,7 +161,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164444, @@ -241,7 +243,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} } ], "links": { diff --git a/spec/fixtures/show_droplets_paginated_last.json b/spec/fixtures/show_droplets_paginated_last.json index 84eb602..44005eb 100644 --- a/spec/fixtures/show_droplets_paginated_last.json +++ b/spec/fixtures/show_droplets_paginated_last.json @@ -79,7 +79,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164956, @@ -160,7 +161,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164444, @@ -241,7 +243,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} } ], "links": { diff --git a/spec/fixtures/show_droplets_private_ip.json b/spec/fixtures/show_droplets_private_ip.json index e9f3214..8c3d8e8 100644 --- a/spec/fixtures/show_droplets_private_ip.json +++ b/spec/fixtures/show_droplets_private_ip.json @@ -85,7 +85,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164956, @@ -166,7 +167,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} }, { "id": 3164444, @@ -247,7 +249,8 @@ "metadata" ], "available": null - } + }, + "size": {"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams2","ams3","blr1","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sfo2","sgp1","tor1"],"available":true} } ], "links": { @@ -255,4 +258,4 @@ "meta": { "total": 4 } -} \ No newline at end of file +}