Skip to content

Commit bf4eb60

Browse files
Confirm user and fix spec
1 parent db9cadb commit bf4eb60

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

lib/travis/services/assembla_user_service.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def find_or_create_user
1616
vcs_type: 'AssemblaUser'
1717
)
1818
user.vcs_oauth_token = @payload['refresh_token']
19+
user.confirmed_at = DateTime.now if user.confirmed_at.nil?
1920
user.save!
2021
sync_user(user.id)
2122
user

spec/lib/services/assembla_user_service_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
expect(service_user.email).to eq(expected_attrs[:email])
3838
expect(service_user.name).to eq(expected_attrs[:name])
3939
expect(service_user.vcs_id).to eq(expected_attrs[:vcs_id])
40+
expect(service_user.confirmed_at).to be_present
4041
end
4142

4243
context 'when sync fails' do

spec/unit/endpoint/assembla_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
let(:organizations) { double('Organizations') }
2424
let(:subscription_response) { { 'status' => 'subscribed' } }
2525
let(:assembla_cluster) { 'eu' }
26+
let(:access_token) { double('AccessToken', token: 'mocked_access_token_123') }
2627
let!(:original_deep_integration_enabled) { Travis.config[:deep_integration_enabled] }
2728

2829
before do
@@ -46,6 +47,7 @@
4647
allow(service).to receive(:find_or_create_user).and_return(user)
4748
allow(service).to receive(:find_or_create_organization).with(user).and_return(organization)
4849
allow(service).to receive(:create_org_subscription).with(user, organization.id).and_return(subscription_response)
50+
allow(Travis::Api::App::AccessToken).to receive(:create).with(user: user, app_id: 0).and_return(access_token)
4951
end
5052

5153
it 'creates user, organization and subscription' do
@@ -55,7 +57,7 @@
5557
expect(last_response.status).to eq(200)
5658
body = JSON.parse(last_response.body)
5759
expect(body['login']).to eq(user.login)
58-
expect(body['token']).to eq(user.token)
60+
expect(body['token']).to eq(access_token.token)
5961
end
6062
end
6163

0 commit comments

Comments
 (0)