Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/travis/api/app/endpoint/assembla.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ class Assembla < Endpoint
{
user_id: user.id,
login: user.login,
token: access_token
token: access_token,
asset_token: user.asset_token,
rss_token: user.rss_token
}
end

Expand Down
8 changes: 8 additions & 0 deletions lib/travis/model/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ def with_email(email_address)
end
end

def asset_token
tokens.asset.first&.token
end

def rss_token
tokens.rss.first&.token
end

def touch
update(last_activity_at: Time.now) if last_activity_at.nil? || Time.now.utc - last_activity_at > 300
end
Expand Down
12 changes: 12 additions & 0 deletions spec/lib/model/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,18 @@ def user(payload)
end
end

describe '#asset_token' do
it 'returns the asset token' do
expect(user.asset_token).to eq(user.tokens.asset.first.token)
end
end

describe '#rss_token' do
it 'returns the rss token' do
expect(user.rss_token).to eq(user.tokens.rss.first.token)
end
end

describe '#preferences' do
it 'keeps them as ruby hash' do
user.preferences = { 'a' => 'b', 'c' => 'd' }.to_json
Expand Down
4 changes: 3 additions & 1 deletion spec/unit/endpoint/assembla_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
end
let(:token) { JWT.encode(payload, jwt_secret, 'HS256') }
let(:user) { double('User', id: 1, login: 'testuser', token: 'abc123', name: 'Test User', email: '[email protected]', organizations: organizations) }
let(:user) { double('User', id: 1, login: 'testuser', token: 'abc123', rss_token: "rss_token", asset_token: 'asset_token', name: 'Test User', email: '[email protected]', organizations: organizations) }
let(:organization) { double('Organization', id: 1) }
let(:organizations) { double('Organizations') }
let(:subscription_response) { { 'status' => 'subscribed' } }
Expand Down Expand Up @@ -59,6 +59,8 @@
body = JSON.parse(last_response.body)
expect(body['login']).to eq(user.login)
expect(body['token']).to eq(access_token.token)
expect(body['asset_token']).to eq(user.asset_token)
expect(body['rss_token']).to eq(user.rss_token)
end
end

Expand Down