[TBT-381] Feedback incorporated

Author: mshahzaib-travis

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

@@ -57,9 +57,8 @@ def deep_integration_enabled?
       end
 
       def valid_asm_cluster?
-        allowed = Array(Travis.config.assembla_clusters.to_s.split(','))
-        cluster = request.env[CLUSTER_HEADER]
-        allowed.include?(cluster)
+        allowed = Travis.config.assembla_clusters.to_s.split(',')
+        allowed.include?(request.env[CLUSTER_HEADER])
       end
     end
   end

lib/travis/api/app/jwt_utils.rb

@@ -10,7 +10,7 @@ def verify_jwt(request)
       halt 401, { error: "Missing JWT" } unless token
 
       begin
-        decoded, = JWT.decode(token, Travis.config.assembla_jwt_secret, true, algorithm: 'HS256' )
+        decoded, = JWT.decode(token, Travis.config.assembla_jwt_secret, true, algorithm: 'HS256')
         decoded
       rescue JWT::DecodeError => e
         halt 401, { error: "Invalid JWT: #{e.message}" }

lib/travis/config/defaults.rb

@@ -110,7 +110,7 @@ def fallback_logs_api_auth_token
             assembla_clusters: 'eu, us',
             deep_integration_enabled: false,
             assembla_jwt_secret: 'assembla_jwt_secret',
-            beta_plan_name: 'beta_plan'
+            deep_integration_beta_plan_name: 'beta_plan'
 
     default :_access => [:key]
 

lib/travis/services/assembla_user_service.rb

@@ -3,11 +3,6 @@ module Services
     class AssemblaUserService
       class SyncError < StandardError; end
 
-      BILLING_COUNTRY = 'Poland'
-      BILLING_ADDRESS = "System-generated for user %{login} (%{id})"
-      BILLING_CITY = "AutoCity-%{id}"
-      BILLING_ZIP = "000%{id}"
-
       def initialize(payload)
         @payload = payload
       end
@@ -50,7 +45,7 @@ def sync_user(user_id)
 
       def subscription_params(user, organization_id)
         {
-          'plan' => Travis.config.beta_plan_name,
+          'plan' => Travis.config.deep_integration_plan_name,
           'organization_id' => organization_id,
           'billing_info' => billing_info(user),
           'credit_card_info' => { 'token' => nil }
@@ -59,12 +54,12 @@ def subscription_params(user, organization_id)
 
       def billing_info(user)
         {
-          'address' => BILLING_ADDRESS % { login: user.login, id: user.id },
-          'city' => BILLING_CITY % { id: user.id },
-          'country' => BILLING_COUNTRY,
+          'address' => 'Dummy Address',
+          'city' => 'Dummy City',
+          'country' => 'Dummy Country',
           'first_name' => user.name&.split&.first,
           'last_name' => user.name&.split&.last,
-          'zip_code' => BILLING_ZIP % { id: user.id },
+          'zip_code' => 'DUMMY ZIP',
           'billing_email' => user.email
         }
       end

spec/lib/services/assembla_user_service_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'factory_bot'
 
 RSpec.describe Travis::Services::AssemblaUserService do
   let(:payload) do
@@ -83,8 +82,8 @@
 
         result = service.create_org_subscription(user, organization.id)
         expect(result[:error]).to be_truthy
-        expect(result[:details]).to be_present
+        expect(result[:details]).to eq(error.message)
       end
     end
   end
-end
+end