From 19003502494dd91dcdd69a958c096b800bfa80e1 Mon Sep 17 00:00:00 2001 From: Devin Gaffney Date: Tue, 30 Jan 2024 08:08:04 -0800 Subject: [PATCH] refactors from PR --- app/models/concerns/alegre_v2.rb | 2 +- test/models/bot/alegre_v2_test.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/alegre_v2.rb b/app/models/concerns/alegre_v2.rb index 10ea6e99d8..3d9f84ca62 100644 --- a/app/models/concerns/alegre_v2.rb +++ b/app/models/concerns/alegre_v2.rb @@ -234,7 +234,7 @@ def parse_similarity_results(project_media, field, results, relationship_type) def safe_get_sync(project_media, field, params={}) response = get_sync(project_media, field, params) retries = 0 - while (response == nil or response["result"] == nil) and retries < 3 + while (response.nil? || response["result"].nil?) && retries < 3 response = get_sync(project_media, field, params) retries += 1 end diff --git a/test/models/bot/alegre_v2_test.rb b/test/models/bot/alegre_v2_test.rb index cc8822f85b..e9c15cff12 100644 --- a/test/models/bot/alegre_v2_test.rb +++ b/test/models/bot/alegre_v2_test.rb @@ -285,9 +285,8 @@ def teardown test "should safe_get_sync" do pm1 = create_project_media team: @team, media: create_uploaded_audio - response = {} - WebMock.stub_request(:post, "#{CheckConfig.get('alegre_host')}/similarity/sync/audio").with(body: {:doc_id=>Bot::Alegre.item_doc_id(pm1), :context=>{:team_id=>pm1.team_id, :project_media_id=>pm1.id, :has_custom_id=>true}, :url=>Bot::Alegre.media_file_url(pm1)}).to_return(body: response.to_json) - assert_equal Bot::Alegre.safe_get_sync(pm1, "audio", {}), {} + WebMock.stub_request(:post, "#{CheckConfig.get('alegre_host')}/similarity/sync/audio").to_return(body: '{}') + assert_equal {}, Bot::Alegre.safe_get_sync(pm1, "audio", {}) end test "should run delete request" do