File tree Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ def find_or_create_user
16
16
vcs_type : 'AssemblaUser'
17
17
)
18
18
user . vcs_oauth_token = @payload [ 'refresh_token' ]
19
+ user . confirmed_at = DateTime . now if user . confirmed_at . nil?
19
20
user . save!
20
21
sync_user ( user . id )
21
22
user
Original file line number Diff line number Diff line change 37
37
expect ( service_user . email ) . to eq ( expected_attrs [ :email ] )
38
38
expect ( service_user . name ) . to eq ( expected_attrs [ :name ] )
39
39
expect ( service_user . vcs_id ) . to eq ( expected_attrs [ :vcs_id ] )
40
+ expect ( service_user . confirmed_at ) . to be_present
40
41
end
41
42
42
43
context 'when sync fails' do
Original file line number Diff line number Diff line change 23
23
let ( :organizations ) { double ( 'Organizations' ) }
24
24
let ( :subscription_response ) { { 'status' => 'subscribed' } }
25
25
let ( :assembla_cluster ) { 'eu' }
26
+ let ( :access_token ) { double ( 'AccessToken' , token : 'mocked_access_token_123' ) }
26
27
let! ( :original_deep_integration_enabled ) { Travis . config [ :deep_integration_enabled ] }
27
28
28
29
before do
46
47
allow ( service ) . to receive ( :find_or_create_user ) . and_return ( user )
47
48
allow ( service ) . to receive ( :find_or_create_organization ) . with ( user ) . and_return ( organization )
48
49
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 )
49
51
end
50
52
51
53
it 'creates user, organization and subscription' do
55
57
expect ( last_response . status ) . to eq ( 200 )
56
58
body = JSON . parse ( last_response . body )
57
59
expect ( body [ 'login' ] ) . to eq ( user . login )
58
- expect ( body [ 'token' ] ) . to eq ( user . token )
60
+ expect ( body [ 'token' ] ) . to eq ( access_token . token )
59
61
end
60
62
end
61
63
You can’t perform that action at this time.
0 commit comments