Skip to content

Commit 1a2c602

Browse files
[TBT-381] used default values in spec
1 parent a1bf5c3 commit 1a2c602

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

lib/travis/api/app/endpoint/assembla.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ def valid_asm_cluster?
6262
end
6363
end
6464
end
65-
end
65+
end

lib/travis/config/defaults.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def fallback_logs_api_auth_token
110110
assembla_clusters: 'eu, us',
111111
deep_integration_enabled: false,
112112
assembla_jwt_secret: 'assembla_jwt_secret',
113-
deep_integration_beta_plan_name: 'beta_plan'
113+
deep_integration_plan_name: 'beta_plan'
114114

115115
default :_access => [:key]
116116

spec/unit/endpoint/assembla_spec.rb

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
RSpec.describe Travis::Api::App::Endpoint::Assembla, set_app: true do
66
include Rack::Test::Methods
77

8-
let(:jwt_secret) { 'testsecret' }
8+
let(:jwt_secret) { 'assembla_jwt_secret' }
99
let(:payload) do
1010
{
1111
'name' => 'Test User',
@@ -22,18 +22,17 @@
2222
let(:organization) { double('Organization', id: 1) }
2323
let(:organizations) { double('Organizations') }
2424
let(:subscription_response) { { 'status' => 'subscribed' } }
25-
let(:assembla_cluster) { 'cluster1' }
25+
let(:assembla_cluster) { 'eu' }
26+
let!(:original_deep_integration_enabled) { Travis.config[:deep_integration_enabled] }
2627

2728
before do
2829
Travis.config[:deep_integration_enabled] = true
29-
Travis.config[:assembla_clusters] = assembla_cluster
30-
Travis.config[:assembla_jwt_secret] = jwt_secret
3130

3231
header 'X_ASSEMBLA_CLUSTER', assembla_cluster
3332
end
3433

3534
after do
36-
Travis.config[:deep_integration_enabled] = false
35+
Travis.config[:deep_integration_enabled] = original_deep_integration_enabled
3736
end
3837

3938
describe 'POST /assembla/login' do
@@ -56,7 +55,7 @@
5655
expect(last_response.status).to eq(200)
5756
body = JSON.parse(last_response.body)
5857
expect(body['login']).to eq(user.login)
59-
expect(body['token']).to eq('abc123')
58+
expect(body['token']).to eq(user.token)
6059
end
6160
end
6261

@@ -93,7 +92,9 @@
9392
end
9493

9594
context 'when integration is not enabled' do
96-
before { Travis.config[:deep_integration_enabled] = false }
95+
96+
before { Travis.config[:deep_integration_enabled] = original_deep_integration_enabled }
97+
after { Travis.config[:deep_integration_enabled] = true }
9798

9899
it 'returns 403' do
99100
header 'Authorization', "Bearer #{token}"

0 commit comments

Comments
 (0)