From b9caa09e9cb531cdfef8f8ea894147001f7234d0 Mon Sep 17 00:00:00 2001 From: Jay Joshua Date: Mon, 24 Feb 2025 10:16:04 +0100 Subject: [PATCH] Remove more references to Comment from tests Remove more references to Comment from tests --- config/initializers/field_validators.rb | 2 +- test/controllers/graphql_controller_test.rb | 2 +- test/models/team_import_test.rb | 71 --------------------- 3 files changed, 2 insertions(+), 73 deletions(-) diff --git a/config/initializers/field_validators.rb b/config/initializers/field_validators.rb index 50056915f0..2a3799b562 100644 --- a/config/initializers/field_validators.rb +++ b/config/initializers/field_validators.rb @@ -52,7 +52,7 @@ def field_validator_type_bot_response_format errormsg = I18n.t(:task_suggestion_invalid_value) begin json = JSON.parse(self.value) - errors.add(:base, errormsg) if json.keys != ['suggestion', 'comment'] + errors.add(:base, errormsg) if json.keys != ['suggestion'] rescue errors.add(:base, errormsg) end diff --git a/test/controllers/graphql_controller_test.rb b/test/controllers/graphql_controller_test.rb index 7feae73c84..988b1f8fcd 100644 --- a/test/controllers/graphql_controller_test.rb +++ b/test/controllers/graphql_controller_test.rb @@ -378,7 +378,7 @@ def setup create_tag annotated: pm, annotator: u create_dynamic_annotation annotated: pm, annotator: u, annotation_type: 'metadata' end - query = "query GetById { project_media(ids: \"#{pm.id},#{p.id}\") { last_status, domain, pusher_channel, account { url }, dbid, annotations_count(annotation_type: \"comment\"), user { name }, tags(first: 1) { edges { node { tag } } }, project { title }, log(first: 1000) { edges { node { event_type, object_after, updated_at, created_at, meta, object_changes_json, user { name }, annotation { id, created_at, updated_at }, task { id }, tag { id } } } } } }" + query = "query GetById { project_media(ids: \"#{pm.id},#{p.id}\") { last_status, domain, pusher_channel, account { url }, dbid, tags(first: 1) { edges { node { tag } } }, project { title }, log(first: 1000) { edges { node { event_type, object_after, updated_at, created_at, meta, object_changes_json, user { name }, annotation { id, created_at, updated_at }, task { id }, tag { id } } } } } }" post :create, params: { query: query, team: 'team' } assert_response :success assert_not_equal 0, JSON.parse(@response.body)['data']['project_media']['log']['edges'].size diff --git a/test/models/team_import_test.rb b/test/models/team_import_test.rb index c3ab9217e3..cfc8eab83e 100644 --- a/test/models/team_import_test.rb +++ b/test/models/team_import_test.rb @@ -156,77 +156,6 @@ # assert_equal pm.full_url, result[row].join(', ') # end -# test "should add as note column 'Item note'" do -# user_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{@user.id}" -# data = { item: random_string, user: user_url, projects: @p.url, annotator: user_url, note1: 'A note', note2: 'Other note' } -# spreadsheet_id = "1lyxWWe9rRJPZejkCpIqVrK54WUV2UJl9sR75W5_Z9jo" -# row = add_data_on_spreadsheet(data) - -# result = @team.import_spreadsheet(@@spreadsheet_id, @@worksheet.title, @user.id) -# pm = Media.find_by_quote(data[:item]).project_medias.first -# assert_equal ['A note', 'Other note'], pm.comments.map(&:text).sort -# assert_equal pm.full_url, result[row].join(', ') -# assert_equal 2, pm.get_versions_log.where(item_type: 'Comment').count -# end - -# test "should not add note if annotator is not valid" do -# user_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{@user.id}" -# invalid_annotator = 'some annotator that is invalid' -# data1 = { item: random_string, user: user_url, projects: @p.url, annotator: invalid_annotator, note1: 'A note' } -# spreadsheet_id = "1lyxWWe9rRJPZejkCpIqVrK54WUV2UJl9sR75W5_Z9jo" -# row_with_invalid_annotator = add_data_on_spreadsheet(data1) - -# user2 = create_user is_admin: true -# user2_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{user2.id}" -# data2 = data1.merge({ item: random_string, annotator: user2_url}) -# row_with_valid_annotator = add_data_on_spreadsheet(data2) - -# result = @team.import_spreadsheet(@@spreadsheet_id, @@worksheet.title, @user.id) -# pm1 = Media.find_by_quote(data1[:item]).project_medias.first -# assert pm1.comments.empty? -# assert_match(I18n.t("team_import.invalid_annotator", { user: invalid_annotator }), result[row_with_invalid_annotator].join(', ')) - -# pm2 = Media.find_by_quote(data2[:item]).project_medias.first -# assert_equal ['A note'], pm2.comments.map(&:text) -# assert_no_match(I18n.t("team_import.invalid_annotator", { user: invalid_annotator }), result[row_with_valid_annotator].join(', ')) -# end - -# test "should add user as annotator if annotator is blank" do -# user_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{@user.id}" -# data = { item: random_string, user: user_url, projects: @p.url, note1: 'A note' } -# spreadsheet_id = "1lyxWWe9rRJPZejkCpIqVrK54WUV2UJl9sR75W5_Z9jo" -# row = add_data_on_spreadsheet(data) - -# result = @team.import_spreadsheet(@@spreadsheet_id, @@worksheet.title, @user.id) -# pm = Media.find_by_quote(data[:item]).project_medias.first -# assert_equal [@user.id], pm.comments.map(&:annotator_id) -# assert_no_match(I18n.t("team_import.invalid_annotator"), result[row].join(', ')) -# end - -# test "should add annotator with user email or team owner" do -# user2 = create_user -# create_team_user team: @team, user: user2 -# user_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{@user.id}" -# data1 = { item: random_string, user: user_url, projects: @p.url, annotator: user2.email, note1: 'A note' } -# spreadsheet_id = "1lyxWWe9rRJPZejkCpIqVrK54WUV2UJl9sR75W5_Z9jo" -# row_with_email_annotator = add_data_on_spreadsheet(data1) - -# team_owner = create_user -# create_team_user team: @team, user: team_owner, role: 'admin' -# data2 = data1.merge({ item: random_string, annotator: 'user@invalid.com', note1: 'Other note'}) -# row_with_invalid_email_annotator = add_data_on_spreadsheet(data2) - -# result = @team.import_spreadsheet(@@spreadsheet_id, @@worksheet.title, @user.id) - -# pm1 = Media.find_by_quote(data1[:item]).project_medias.first -# assert_equal ['A note'], pm1.comments.map(&:text) -# assert_equal [user2.id], pm1.comments.map(&:annotator_id) - -# pm2 = Media.find_by_quote(data2[:item]).project_medias.first -# assert_equal ['Other note'], pm2.comments.map(&:text) -# assert_equal [team_owner.id], pm2.comments.map(&:annotator_id) -# end - # test "should not assign if user on assigned to is not valid" do # user_url = "#{CheckConfig.get('checkdesk_client')}/check/user/#{@user.id}" # invalid_assignee = 'Some assignee that is invalid'