diff --git a/lib/discourse_code_review/github_user_syncer.rb b/lib/discourse_code_review/github_user_syncer.rb index 06c02c7..f6f59d5 100644 --- a/lib/discourse_code_review/github_user_syncer.rb +++ b/lib/discourse_code_review/github_user_syncer.rb @@ -7,13 +7,13 @@ def ensure_user(name:, email: nil, github_login: nil, github_id: nil) user ||= if github_id - User.find_by( - id: - UserCustomField - .select(:user_id) - .where(name: GithubId, value: github_id) - .limit(1) - ) + User.find_by( + id: + UserCustomField + .select(:user_id) + .where(name: GithubId, value: github_id) + .limit(1) + ) end user ||= diff --git a/lib/discourse_code_review/importer.rb b/lib/discourse_code_review/importer.rb index 9111195..78dead4 100644 --- a/lib/discourse_code_review/importer.rb +++ b/lib/discourse_code_review/importer.rb @@ -14,7 +14,6 @@ def self.sync_commit(sha) repo = GithubRepo.new(repo_name, client) importer = Importer.new(repo) - if commit = repo.commit(sha) importer.sync_commit(commit) return repo_name @@ -184,8 +183,8 @@ def import_commit(commit) value: commit[:hash] ) - linked_topics.values.each do |topic| - topic.add_moderator_post( + linked_topics.values.each do |topik| + topik.add_moderator_post( user, " #{post.topic.url}", bump: false, diff --git a/spec/requests/discourse_code_review/code_review_controller_spec.rb b/spec/requests/discourse_code_review/code_review_controller_spec.rb index acf6c13..1eef641 100644 --- a/spec/requests/discourse_code_review/code_review_controller_spec.rb +++ b/spec/requests/discourse_code_review/code_review_controller_spec.rb @@ -99,7 +99,7 @@ expect(commit.user.notifications.count).to eq(1) notification = commit.user.notifications.first - expect(JSON.parse(notification.data)).to eq({ "num_approved_commits" => 1 }) + expect(JSON.parse(notification.data)).to eq("num_approved_commits" => 1) expect(notification.topic_id).to eq(commit.topic.id) expect(notification.post_number).to eq(2) end @@ -127,7 +127,7 @@ expect(author.notifications.count).to eq(1) notification = author.notifications.first - expect(JSON.parse(notification.data)).to eq({ "num_approved_commits" => 2 }) + expect(JSON.parse(notification.data)).to eq("num_approved_commits" => 2) expect(notification.topic_id).to be_nil expect(notification.post_number).to be_nil end