Skip to content

Commit b1b5456

Browse files
committed
fix broken github login
1 parent fd3b0c8 commit b1b5456

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

app/controllers/api/reports_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ def simplecov
99
report.generate_bundled_html if report.parts_complete?
1010
general_coverage = report.results["general_coverage"]
1111

12-
coverage_diff = general_coverage - report.project.last_main_branch_general_coverage
12+
coverage_diff = (general_coverage - report.project.last_main_branch_general_coverage).round(2)
1313
markdown_diff = if coverage_diff.zero?
1414
"(Same as the main branch)"
1515
elsif coverage_diff.positive?
1616
"(+#{coverage_diff}% coverage improved)"
1717
else
18-
"(-#{coverage_diff}% coverage decreased 😢)"
18+
"(#{coverage_diff}% coverage decreased 😢)"
1919
end
2020

2121
markdown = <<~MARKDOWN

app/services/users/omniauth_upserter.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ def call
1818
end
1919

2020
enroll_from_organization_queues
21+
22+
@user
2123
end
2224

2325
private

test/services/users/omniauth_upserter_test.rb

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ def setup
2222

2323
def test_creates_new_user_if_not_existing
2424
assert_difference "User.count", 1 do
25-
::Users::OmniauthUpserter.new(@auth).call
25+
@returned_user = ::Users::OmniauthUpserter.new(@auth).call
2626
end
2727

28-
user = User.find_by(uid: @auth.uid)
29-
assert_equal "github", user.provider
30-
assert_equal "12345", user.uid
31-
assert_equal "testuser", user.handle
32-
assert_equal "[email protected]", user.email
28+
assert_equal "github", @returned_user.provider
29+
assert_equal "12345", @returned_user.uid
30+
assert_equal "testuser", @returned_user.handle
31+
assert_equal "[email protected]", @returned_user.email
3332
end
3433

3534
def test_finds_existing_user_if_already_exists
@@ -42,26 +41,26 @@ def test_finds_existing_user_if_already_exists
4241
)
4342

4443
assert_no_difference "User.count" do
45-
::Users::OmniauthUpserter.new(@auth).call
44+
@returned_user = ::Users::OmniauthUpserter.new(@auth).call
4645
end
4746

48-
user = User.find_by(uid: @auth.uid)
49-
assert_equal existing_user.id, user.id
47+
assert_equal existing_user.id, @returned_user.id
5048
end
5149

5250
def test_enrolls_user_from_organization_queues
53-
::Users::OmniauthUpserter.new(@auth).call
54-
user = User.find_by(uid: @auth.uid)
51+
@returned_user = ::Users::OmniauthUpserter.new(@auth).call
5552

56-
assert @organization.reload.user_queue.exclude?(user.handle)
57-
assert OrganizationUser.exists?(organization: @organization, user: user)
53+
assert @organization.reload.user_queue.exclude?(@returned_user.handle)
54+
assert OrganizationUser.exists?(organization: @organization, user: @returned_user)
5855
end
5956

6057
def test_does_not_fail_when_handle_not_in_queue
6158
@organization.update!(user_queue: [])
6259

6360
assert_nothing_raised do
64-
::Users::OmniauthUpserter.new(@auth).call
61+
@returned_user = ::Users::OmniauthUpserter.new(@auth).call
6562
end
63+
64+
assert @returned_user.is_a?(User)
6665
end
6766
end

0 commit comments

Comments
 (0)