From 224738e0a135141732ac9579cbad67a9db5e3cbb Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Mon, 7 Oct 2024 11:29:10 +1100 Subject: [PATCH] Per review, clean up code --- app/models/connected_apps/vine.rb | 2 -- ...he_response_do.yml => returns_the_response.yml} | 14 +++++++------- spec/models/connected_apps/vine_spec.rb | 2 +- .../admin/connected_apps_controller_spec.rb | 2 +- spec/services/vine_api_service_spec.rb | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) rename spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/{returns_the_response_do.yml => returns_the_response.yml} (72%) diff --git a/app/models/connected_apps/vine.rb b/app/models/connected_apps/vine.rb index f32858d0b2..704ae5c98b 100644 --- a/app/models/connected_apps/vine.rb +++ b/app/models/connected_apps/vine.rb @@ -4,8 +4,6 @@ # module ConnectedApps class Vine < ConnectedApp - VINE_API_URL = "https://vine-staging.openfoodnetwork.org.au/api/v1/my-team" - def connect(api_key:, vine_api:, **_opts) response = vine_api.my_team diff --git a/spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response_do.yml b/spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response.yml similarity index 72% rename from spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response_do.yml rename to spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response.yml index 136540eb6a..99505aa934 100644 --- a/spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response_do.yml +++ b/spec/fixtures/vcr_cassettes/VineApiService/_my_team/when_a_request_succeed/returns_the_response.yml @@ -9,14 +9,14 @@ http_interactions: headers: X-Authorization: - "" + Accept: + - application/json User-Agent: - Faraday v2.9.0 Authorization: - "" Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" response: status: code: 200 @@ -35,7 +35,7 @@ http_interactions: Cache-Control: - no-cache, private Date: - - Wed, 02 Oct 2024 00:27:30 GMT + - Mon, 07 Oct 2024 04:07:27 GMT Access-Control-Allow-Origin: - "*" X-Frame-Options: @@ -46,8 +46,8 @@ http_interactions: - nosniff body: encoding: ASCII-8BIT - string: '{"meta":{"responseCode":200,"limit":50,"offset":0,"message":"","cached":true,"cached_at":"2024-10-02 - 00:27:30","availableRelations":["teamUsers.user","country"]},"data":{"id":1,"name":"OK200 - Team","country_id":14,"created_at":"2024-09-12T06:39:07.000000Z","updated_at":"2024-09-12T06:39:07.000000Z","deleted_at":null}}' - recorded_at: Wed, 02 Oct 2024 00:27:30 GMT + string: '{"meta":{"responseCode":200,"limit":50,"offset":0,"message":"","cached":true,"cached_at":"2024-10-07 + 04:07:27","availableRelations":["teamUsers.user","country"]},"data":{"id":9,"name":"Open + Food Network TEST","country_id":14,"created_at":"2024-10-05T03:39:50.000000Z","updated_at":"2024-10-05T03:39:50.000000Z","deleted_at":null}}' + recorded_at: Mon, 07 Oct 2024 04:07:27 GMT recorded_with: VCR 6.2.0 diff --git a/spec/models/connected_apps/vine_spec.rb b/spec/models/connected_apps/vine_spec.rb index 7d94d3693e..e63ae42b07 100644 --- a/spec/models/connected_apps/vine_spec.rb +++ b/spec/models/connected_apps/vine_spec.rb @@ -15,7 +15,7 @@ RSpec.describe ConnectedApps::Vine do connected_app.connect(api_key: vine_api_key, vine_api: ) end - context "when request succeed", :vcr do + context "when request succeed" do it "store the vine api key" do allow(vine_api).to receive(:my_team).and_return(mock_api_response(true)) diff --git a/spec/requests/admin/connected_apps_controller_spec.rb b/spec/requests/admin/connected_apps_controller_spec.rb index 9b4caedca1..66b00a5985 100644 --- a/spec/requests/admin/connected_apps_controller_spec.rb +++ b/spec/requests/admin/connected_apps_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Admin::ConnectedAppsController do +RSpec.describe "Admin ConnectedApp" do let(:user) { create(:admin_user) } let(:enterprise) { create(:enterprise, owner: user) } let(:edit_enterprise_url) { "#{edit_admin_enterprise_url(enterprise)}#/connected_apps_panel" } diff --git a/spec/services/vine_api_service_spec.rb b/spec/services/vine_api_service_spec.rb index c0cb2953a4..0614931719 100644 --- a/spec/services/vine_api_service_spec.rb +++ b/spec/services/vine_api_service_spec.rb @@ -52,7 +52,7 @@ RSpec.describe VineApiService do end context "when a request succeed", :vcr do - it "returns the response do" do + it "returns the response" do response = vine_api.my_team expect(response.success?).to be(true)