finapps 5.0.3 → 5.0.4

data/spec/rest/tenant_settings_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe FinApps::REST::TenantSettings do
 
     it { expect { show }.not_to raise_error }
     it('performs a get and returns the response') do
-      expect(show[RESULTS]).to respond_to(:iav_default_product)
+      expect(show[RESULTS]).to have_key(:iav_default_product)
     end
     it('returns no error messages') { expect(show[ERROR_MESSAGES]).to be_empty }
   end
@@ -21,15 +21,21 @@ RSpec.describe FinApps::REST::TenantSettings do
 
     context 'when missing params' do
       let(:params) { nil }
-      it { expect { update }.to raise_error(FinAppsCore::MissingArgumentsError) }
+      it do
+        expect { update }.to raise_error(FinAppsCore::MissingArgumentsError)
+      end
     end
 
     context 'when valid params are provided' do
       let(:params) { { iav_default_product: 'valid' } }
 
       it { expect { update }.not_to raise_error }
-      it('performs put and returns no content') { expect(update[RESULTS]).to be_nil }
-      it('error_messages array is empty') { expect(update[ERROR_MESSAGES]).to be_empty }
+      it('performs put and returns no content') do
+        expect(update[RESULTS]).to be_nil
+      end
+      it('error_messages array is empty') do
+        expect(update[ERROR_MESSAGES]).to be_empty
+      end
     end
 
     context 'when invalid params are provided' do
@@ -37,7 +43,9 @@ RSpec.describe FinApps::REST::TenantSettings do
 
       it { expect { update }.not_to raise_error }
       it('results is nil') { expect(update[RESULTS]).to be_nil }
-      it('error_messages array is populated') { expect(update[ERROR_MESSAGES]).not_to be_empty }
+      it('error_messages array is populated') do
+        expect(update[ERROR_MESSAGES]).not_to be_empty
+      end
     end
   end
 end

data/spec/rest/version_spec.rb

@@ -7,6 +7,8 @@ RSpec.describe FinApps::REST::Version do
   describe '#show' do
     it { expect { subject.show }.not_to raise_error }
     it('returns a string') { expect(subject.show[0]).to be_a(String) }
-    it('starts with the words "Version =>"') { expect(subject.show[0]).to start_with('Version =>') }
+    it('starts with the words "Version =>"') do
+      expect(subject.show[0]).to start_with('Version =>')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ RSpec.configure do |config|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
     expectations.syntax = :expect
   end
-  config.mock_with(:rspec) {|mocks| mocks.verify_partial_doubles = true }
+  config.mock_with(:rspec) { |mocks| mocks.verify_partial_doubles = true }
   # config.filter_run_including :focus => true
   config.default_formatter = 'doc' if config.files_to_run.one?
   config.order = :random
@@ -30,14 +30,16 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 
   config.before(:each) do
-    base_url = "#{FinAppsCore::REST::Defaults::DEFAULTS[:host]}/v#{FinAppsCore::REST::Defaults::API_VERSION}/"
+    base_url =
+      "#{FinAppsCore::REST::Defaults::DEFAULTS[:host]}/v#{FinAppsCore::REST::Defaults::API_VERSION}/"
     stub_request(:any, /#{base_url}/).to_rack(::FakeApi)
   end
   WebMock.disable_net_connect!(allow: 'codeclimate.com')
 end
 
-VALID_CREDENTIALS = { identifier: '49fb918d-7e71-44dd-7378-58f19606df2a',
-                      token: 'hohoho=' }.freeze
+VALID_CREDENTIALS = {
+  identifier: '49fb918d-7e71-44dd-7378-58f19606df2a', token: 'hohoho='
+}.freeze
 
 RESULTS = 0
 ERROR_MESSAGES = 1

data/spec/spec_helpers/client.rb

@@ -3,7 +3,8 @@
 module SpecHelpers
   module Client
     def client(tenant_token = :tenant_token)
-      FinApps::REST::Client.new tenant_token, rashify: true
+      logger = Logger.new(IO::NULL)
+      FinApps::REST::Client.new tenant_token, {}, logger
     end
   end
 end

data/spec/support/fake_api.rb

@@ -4,19 +4,19 @@ require 'sinatra/base'
 
 # the FakeApi class is used to mock API requests while testing.
 class FakeApi < Sinatra::Base
-  def self.version_path
+  def self.version
     "v#{FinAppsCore::REST::Defaults::API_VERSION}"
   end
 
   # resource
-  post("/#{version_path}/resources") { json_response 201, 'resource.json' }
-  get("/#{version_path}/resources/:id") { json_response 200, 'resource.json' }
-  get("/#{version_path}/resources") { json_response 200, 'resources.json' }
-  put("/#{version_path}/resources") { json_response 201, 'resource.json' }
-  delete("/#{version_path}/resources/:id") { status 202 }
+  post("/#{version}/resources") { json_response 201, 'resource.json' }
+  get("/#{version}/resources/:id") { json_response 200, 'resource.json' }
+  get("/#{version}/resources") { json_response 200, 'resources.json' }
+  put("/#{version}/resources") { json_response 201, 'resource.json' }
+  delete("/#{version}/resources/:id") { status 202 }
 
   # plaid
-  post("/#{version_path}/p/webhook") do
+  post("/#{version}/p/webhook") do
     tenant_token = request.env['HTTP_X_TENANT_TOKEN']
     if tenant_token == 'invalid_tenant_token'
       json_response 404, 'resource_not_found.json'
@@ -26,11 +26,13 @@ class FakeApi < Sinatra::Base
   end
 
   # version
-  get("/#{version_path}/version") { 'Version => 2.1.29-.20161208.172810' }
+  get("/#{version}/version") { 'Version => 2.1.29-.20161208.172810' }
 
   # tenants
-  get("/#{version_path}/settings/tenant") { json_response 200, 'tenant_settings.json' }
-  put("/#{version_path}/settings/tenant") do
+  get("/#{version}/settings/tenant") do
+    json_response 200, 'tenant_settings.json'
+  end
+  put("/#{version}/settings/tenant") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['bad_params']
@@ -39,8 +41,10 @@ class FakeApi < Sinatra::Base
       status 204
     end
   end
-  get("/#{version_path}/settings/app") { json_response 200, 'tenant_app_settings.json' }
-  put("/#{version_path}/settings/app") do
+  get("/#{version}/settings/app") do
+    json_response 200, 'tenant_app_settings.json'
+  end
+  put("/#{version}/settings/app") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['pdf_statement_months']
@@ -51,22 +55,44 @@ class FakeApi < Sinatra::Base
   end
 
   # orders
-  post("/#{version_path}/orders/valid_token") { json_response 200, 'order_token.json' }
-  post("/#{version_path}/orders/invalid_token") { json_response 404, 'resource_not_found.json' }
-  get("/#{version_path}/orders/valid_id") { json_response 200, 'order.json' }
-  get("/#{version_path}/orders") { json_response 200, 'orders.json' }
-  get("/#{version_path}/orders/valid_id/report.:format") { json_response 200, 'order_report.json' }
-  get("/#{version_path}/orders/invalid_id/report.:format") { json_response 404, 'resource_not_found.json' }
-  get("/#{version_path}/orders/valid_id/status") { json_response 200, 'order_status.json' }
-  get("/#{version_path}/orders/invalid_id/status") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/orders/valid_id/cancel") { status 204 }
-  put("/#{version_path}/orders/invalid_id/cancel") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/orders/valid_id/notify") { status 204 }
-  put("/#{version_path}/orders/invalid_id/notify") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/orders/valid_id/refresh") { json_response 200, 'order_refresh.json' }
-  put("/#{version_path}/orders/invalid_id/refresh") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/orders/invalid_id") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/orders/valid_id") do
+  post("/#{version}/orders/valid_token") do
+    json_response 200, 'order_token.json'
+  end
+  post("/#{version}/orders/invalid_token") do
+    json_response 404, 'resource_not_found.json'
+  end
+  get("/#{version}/orders/valid_id") { json_response 200, 'order.json' }
+  get("/#{version}/orders") { json_response 200, 'orders.json' }
+  get("/#{version}/orders/valid_id/report.:format") do
+    json_response 200, 'order_report.json'
+  end
+  get("/#{version}/orders/invalid_id/report.:format") do
+    json_response 404, 'resource_not_found.json'
+  end
+  get("/#{version}/orders/valid_id/status") do
+    json_response 200, 'order_status.json'
+  end
+  get("/#{version}/orders/invalid_id/status") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/orders/valid_id/cancel") { status 204 }
+  put("/#{version}/orders/invalid_id/cancel") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/orders/valid_id/notify") { status 204 }
+  put("/#{version}/orders/invalid_id/notify") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/orders/valid_id/refresh") do
+    json_response 200, 'order_refresh.json'
+  end
+  put("/#{version}/orders/invalid_id/refresh") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/orders/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/orders/valid_id") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['accounts'] == 'valid_account'
@@ -75,10 +101,10 @@ class FakeApi < Sinatra::Base
       json_response 400, 'invalid_request_body.json'
     end
   end
-  post("/#{version_path}/orders") do
+  post("/#{version}/orders") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
-    if %w[applicant institutions product].all? {|s| request_payload.key? s }
+    if %w[applicant institutions product].all? { |s| request_payload.key? s }
       json_response 200, 'order_token.json'
     else
       json_response 400, 'invalid_request_body.json'
@@ -86,34 +112,72 @@ class FakeApi < Sinatra::Base
   end
 
   # institutions
-  get("/#{version_path}/institutions/site/valid_site_id/form") { json_response 200, 'institution_login_form.json' }
-  get("/#{version_path}/institutions/site/invalid_site_id/form") { json_response 400, 'invalid_institution_id.json' }
-  post("/#{version_path}/institutions/site/valid_site_id/add") { json_response 200, 'institution_add.json' }
-  get("/#{version_path}/institutions/search/:search_term") { json_response 200, 'institutions_search_list.json' }
-  get("/#{version_path}/institutions/routing/:routing_number") { json_response 200, 'institutions_routing_number.json' }
-  get("/#{version_path}/institutions/site/:site_id") { json_response 200, 'institutions_routing_number.json' }
+  get("/#{version}/institutions/site/valid_site_id/form") do
+    json_response 200, 'institution_login_form.json'
+  end
+  get("/#{version}/institutions/site/invalid_site_id/form") do
+    json_response 400, 'invalid_institution_id.json'
+  end
+  post("/#{version}/institutions/site/valid_site_id/add") do
+    json_response 200, 'institution_add.json'
+  end
+  get("/#{version}/institutions/search/:search_term") do
+    json_response 200, 'institutions_search_list.json'
+  end
+  get("/#{version}/institutions/routing/:routing_number") do
+    json_response 200, 'institutions_routing_number.json'
+  end
+  get("/#{version}/institutions/site/:site_id") do
+    json_response 200, 'institutions_routing_number.json'
+  end
 
   # user institutions
-  get("/#{version_path}/institutions/consumer/valid_id/status") { json_response 200, 'user_institution_status.json' }
-  get("/#{version_path}/institutions/consumer/invalid_id/status") do
+  get("/#{version}/institutions/consumer/valid_id/status") do
+    json_response 200, 'user_institution_status.json'
+  end
+  get("/#{version}/institutions/consumer/invalid_id/status") do
     json_response 400, 'invalid_user_institution_id.json'
   end
-  get("/#{version_path}/institutions/consumer") { json_response 200, 'user_institutions_list.json' }
-  get("/#{version_path}/institutions/consumer/valid_id") { json_response 200, 'user_institutions_show.json' }
-  get("/#{version_path}/institutions/consumer/invalid_id") { json_response 400, 'invalid_user_institution_id.json' }
-  put("/#{version_path}/institutions/consumer/refresh") { json_response 200, 'user_institutions_refresh_all.json' }
-  put("/#{version_path}/institutions/consumer/valid_id/credentials") { json_response 200, 'institution_add.json' }
-  put("/#{version_path}/institutions/consumer/invalid_id/credentials") do
+  get("/#{version}/institutions/consumer") do
+    json_response 200, 'user_institutions_list.json'
+  end
+  get("/#{version}/institutions/consumer/valid_id") do
+    json_response 200, 'user_institutions_show.json'
+  end
+  get("/#{version}/institutions/consumer/invalid_id") do
     json_response 400, 'invalid_user_institution_id.json'
   end
-  put("/#{version_path}/institutions/consumer/valid_id/mfa") { json_response 200, 'institution_add.json' }
-  put("/#{version_path}/institutions/consumer/invalid_id/mfa") { json_response 400, 'invalid_user_institution_id.json' }
-  delete("/#{version_path}/institutions/consumer/valid_id") { status 204 }
-  delete("/#{version_path}/institutions/consumer/invalid_id") { json_response 400, 'invalid_user_institution_id.json' }
-  get("/#{version_path}/institutions/consumer/valid_id/form") { json_response 200, 'institution_login_form.json' }
-  get("/#{version_path}/institutions/consumer/invalid_id/form") { json_response 400, 'invalid_institution_id.json' }
-  put("/#{version_path}/institutions/refresh") { json_response 200, 'user_institution_refresh.json' }
-  put("/#{version_path}/institutions/consumer/valid_consumer_institution_id/refresh") do
+  put("/#{version}/institutions/consumer/refresh") do
+    json_response 200, 'user_institutions_refresh_all.json'
+  end
+  put("/#{version}/institutions/consumer/valid_id/credentials") do
+    json_response 200, 'institution_add.json'
+  end
+  put("/#{version}/institutions/consumer/invalid_id/credentials") do
+    json_response 400, 'invalid_user_institution_id.json'
+  end
+  put("/#{version}/institutions/consumer/valid_id/mfa") do
+    json_response 200, 'institution_add.json'
+  end
+  put("/#{version}/institutions/consumer/invalid_id/mfa") do
+    json_response 400, 'invalid_user_institution_id.json'
+  end
+  delete("/#{version}/institutions/consumer/valid_id") { status 204 }
+  delete("/#{version}/institutions/consumer/invalid_id") do
+    json_response 400, 'invalid_user_institution_id.json'
+  end
+  get("/#{version}/institutions/consumer/valid_id/form") do
+    json_response 200, 'institution_login_form.json'
+  end
+  get("/#{version}/institutions/consumer/invalid_id/form") do
+    json_response 400, 'invalid_institution_id.json'
+  end
+  put("/#{version}/institutions/refresh") do
+    json_response 200, 'user_institution_refresh.json'
+  end
+  put(
+    "/#{version}/institutions/consumer/valid_consumer_institution_id/refresh"
+  ) do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['token'] == 'invalid_token'
@@ -124,9 +188,13 @@ class FakeApi < Sinatra::Base
   end
 
   # consumers
-  get("/#{version_path}/consumers/valid_public_id") { json_response 200, 'user.json' }
-  get("/#{version_path}/consumers/invalid_public_id") { json_response 404, 'resource_not_found.json' }
-  post("/#{version_path}/consumers") do
+  get("/#{version}/consumers/valid_public_id") do
+    json_response 200, 'user.json'
+  end
+  get("/#{version}/consumers/invalid_public_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  post("/#{version}/consumers") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['password']
@@ -135,31 +203,55 @@ class FakeApi < Sinatra::Base
       json_response 400, 'invalid_request_body.json'
     end
   end
-  put("/#{version_path}/consumers/valid_public_id") { status 204 }
-  put("/#{version_path}/consumers/invalid_public_id") { json_response 400, 'invalid_user_id.json' }
-  put("/#{version_path}/consumers/valid_public_id/password") { json_response 200, 'user.json' }
-  put("/#{version_path}/consumers/invalid_public_id/password") { json_response 404, 'resource_not_found.json' }
-  delete("/#{version_path}/consumers/valid_public_id") { status 204 }
-  delete("/#{version_path}/consumers/invalid_public_id") { json_response 404, 'resource_not_found.json' }
-  post("/#{version_path}/logout") { status 204 }
+  put("/#{version}/consumers/valid_public_id") { status 204 }
+  put("/#{version}/consumers/invalid_public_id") do
+    json_response 400, 'invalid_user_id.json'
+  end
+  put("/#{version}/consumers/valid_public_id/password") do
+    json_response 200, 'user.json'
+  end
+  put("/#{version}/consumers/invalid_public_id/password") do
+    json_response 404, 'resource_not_found.json'
+  end
+  delete("/#{version}/consumers/valid_public_id") { status 204 }
+  delete("/#{version}/consumers/invalid_public_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  post("/#{version}/logout") { status 204 }
 
   # accounts
-  get("/#{version_path}/accounts/valid_id/statement/valid_id") { json_response 200, 'fake_pdf_statement.json' }
-  get("/#{version_path}/accounts/invalid_id/statement/valid_id") { json_response 404, 'resource_not_found.json' }
+  get("/#{version}/accounts/valid_id/statement/valid_id") do
+    json_response 200, 'fake_pdf_statement.json'
+  end
+  get("/#{version}/accounts/invalid_id/statement/valid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # operators
-  get("/#{version_path}/operators") { json_response 200, 'operator_list.json' }
-  get("/#{version_path}/operators/invalid_id") { json_response 404, 'resource_not_found.json' }
-  get("/#{version_path}/operators/valid_id") { json_response 200, 'operator.json' }
-  delete("/#{version_path}/operators/invalid_id") { json_response 404, 'resource_not_found.json' }
-  delete("/#{version_path}/operators/valid_id") { status 204 }
-  post("/#{version_path}/operators/password/change") { json_response 200, 'operator.json' }
-  put("/#{version_path}/operators/invalid_id") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/operators/valid_id") { json_response 200, 'operator.json' }
-  put("/#{version_path}/operators/valid_id/assign") { status 204 }
-  put("/#{version_path}/operators/invalid_id/assign") { json_response 404, 'resource_not_found.json' }
-  post("/#{version_path}/operators/password/forgot") { json_response 200, 'operator_forgot_password.json' }
-  post("/#{version_path}/operators/password/reset")  do
+  get("/#{version}/operators") { json_response 200, 'operator_list.json' }
+  get("/#{version}/operators/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  get("/#{version}/operators/valid_id") { json_response 200, 'operator.json' }
+  delete("/#{version}/operators/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  delete("/#{version}/operators/valid_id") { status 204 }
+  post("/#{version}/operators/password/change") do
+    json_response 200, 'operator.json'
+  end
+  put("/#{version}/operators/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/operators/valid_id") { json_response 200, 'operator.json' }
+  put("/#{version}/operators/valid_id/assign") { status 204 }
+  put("/#{version}/operators/invalid_id/assign") do
+    json_response 404, 'resource_not_found.json'
+  end
+  post("/#{version}/operators/password/forgot") do
+    json_response 200, 'operator_forgot_password.json'
+  end
+  post("/#{version}/operators/password/reset") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['params'] == 'valid'
@@ -168,7 +260,7 @@ class FakeApi < Sinatra::Base
       json_response 400, 'invalid_request_body.json'
     end
   end
-  post("/#{version_path}/operators") do
+  post("/#{version}/operators") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['params'] == 'valid'
@@ -179,7 +271,7 @@ class FakeApi < Sinatra::Base
   end
 
   # session
-  post("/#{version_path}/login") do
+  post("/#{version}/login") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['password'] == 'valid_password'
@@ -188,12 +280,16 @@ class FakeApi < Sinatra::Base
       json_response(401, 'unauthorized.json')
     end
   end
-  post("/#{version_path}/operators/login") { json_response 200, 'operator.json' }
+  post("/#{version}/operators/login") { json_response 200, 'operator.json' }
 
   # password resets
-  post("/#{version_path}/tenant/valid_user_id/password") { json_response 200, 'password_reset_token.json' }
-  post("/#{version_path}/tenant/invalid_user_id/password") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/tenant/valid_user_id/password") do
+  post("/#{version}/tenant/valid_user_id/password") do
+    json_response 200, 'password_reset_token.json'
+  end
+  post("/#{version}/tenant/invalid_user_id/password") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/tenant/valid_user_id/password") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['token'] == 'valid_token'
@@ -202,16 +298,20 @@ class FakeApi < Sinatra::Base
       json_response(400, 'invalid_request_body.json')
     end
   end
-  put("/#{version_path}/tenant/invalid_user_id/password") { json_response 404, 'resource_not_found.json' }
+  put("/#{version}/tenant/invalid_user_id/password") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # products
-  get("/#{version_path}/products") { json_response 200, 'products.json' }
+  get("/#{version}/products") { json_response 200, 'products.json' }
 
   # portfolios
-  get("/#{version_path}/portfolios") { json_response 200, 'portfolios.json' }
-  get("/#{version_path}/portfolios/valid_id") { json_response 200, 'portfolio.json' }
-  get("/#{version_path}/portfolios/invalid_id") { json_response 404, 'resource_not_found.json' }
-  post("/#{version_path}/portfolios") do
+  get("/#{version}/portfolios") { json_response 200, 'portfolios.json' }
+  get("/#{version}/portfolios/valid_id") { json_response 200, 'portfolio.json' }
+  get("/#{version}/portfolios/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  post("/#{version}/portfolios") do
     request.body.rewind
     request_payload = JSON.parse request.body.read
     if request_payload['product'] == 'invalid'
@@ -220,63 +320,97 @@ class FakeApi < Sinatra::Base
       json_response(200, 'portfolio.json')
     end
   end
-  put("/#{version_path}/portfolios/valid_id") { json_response 200, 'portfolio.json' }
-  put("/#{version_path}/portfolios/invalid_id") { json_response 404, 'resource_not_found.json' }
-  delete("/#{version_path}/portfolios/valid_id") { status 204 }
-  delete("/#{version_path}/portfolios/invalid_id") { json_response 404, 'resource_not_found.json' }
+  put("/#{version}/portfolios/valid_id") { json_response 200, 'portfolio.json' }
+  put("/#{version}/portfolios/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  delete("/#{version}/portfolios/valid_id") { status 204 }
+  delete("/#{version}/portfolios/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # alert definitions
-  get("/#{version_path}/portfolio/alerts/definitions") { json_response 200, 'alert_definitions.json' }
-  get("/#{version_path}/portfolio/alerts/definitions/valid_id") { json_response 200, 'alert_definition.json' }
-  get("/#{version_path}/portfolio/alerts/definitions/invalid_id") { json_response 404, 'resource_not_found.json' }
+  get("/#{version}/portfolio/alerts/definitions") do
+    json_response 200, 'alert_definitions.json'
+  end
+  get("/#{version}/portfolio/alerts/definitions/valid_id") do
+    json_response 200, 'alert_definition.json'
+  end
+  get("/#{version}/portfolio/alerts/definitions/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # alert occurrences
-  get("/#{version_path}/portfolio/alerts/occurrences") { json_response 200, 'alert_occurrences.json' }
+  get("/#{version}/portfolio/alerts/occurrences") do
+    json_response 200, 'alert_occurrences.json'
+  end
 
   # portfolios alerts
-  get("/#{version_path}/portfolios/valid_id/alerts") { json_response 200, 'portfolios_alerts.json' }
-  get("/#{version_path}/portfolios/invalid_id/alerts") { json_response 404, 'resource_not_found.json' }
-  put("/#{version_path}/portfolios/valid_id/alerts/valid_id") { status 204 }
-  put("/#{version_path}/portfolios/invalid_id/alerts/invalid_id") { json_response 404, 'resource_not_found.json' }
-  delete("/#{version_path}/portfolios/valid_id/alerts/valid_id") { status 204 }
-  delete("/#{version_path}/portfolios/invalid_id/alerts/invalid_id") { json_response 404, 'resource_not_found.json' }
+  get("/#{version}/portfolios/valid_id/alerts") do
+    json_response 200, 'portfolios_alerts.json'
+  end
+  get("/#{version}/portfolios/invalid_id/alerts") do
+    json_response 404, 'resource_not_found.json'
+  end
+  put("/#{version}/portfolios/valid_id/alerts/valid_id") { status 204 }
+  put("/#{version}/portfolios/invalid_id/alerts/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
+  delete("/#{version}/portfolios/valid_id/alerts/valid_id") { status 204 }
+  delete("/#{version}/portfolios/invalid_id/alerts/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # portfolios consumers
-  get("/#{version_path}/portfolios/valid_id/consumers") { json_response 200, 'portfolios_consumers.json' }
-  get("/#{version_path}/portfolios/invalid_id/consumers") { json_response 404, 'resource_not_found.json' }
-  post("/#{version_path}/portfolios/valid_id/consumers") { status 204 }
-  post("/#{version_path}/portfolios/invalid_id/consumers") do
+  get("/#{version}/portfolios/valid_id/consumers") do
+    json_response 200, 'portfolios_consumers.json'
+  end
+  get("/#{version}/portfolios/invalid_id/consumers") do
+    json_response 404, 'resource_not_found.json'
+  end
+  post("/#{version}/portfolios/valid_id/consumers") { status 204 }
+  post("/#{version}/portfolios/invalid_id/consumers") do
     json_response 400, 'multiple_consumer_subscribe_error.json'
   end
-  post("/#{version_path}/portfolios/valid_id/consumers/valid_id") { status 204 }
-  post("/#{version_path}/portfolios/invalid_id/consumers/invalid_id") do
+  post("/#{version}/portfolios/valid_id/consumers/valid_id") { status 204 }
+  post("/#{version}/portfolios/invalid_id/consumers/invalid_id") do
     json_response 400, 'single_consumer_subscribe_error.json'
   end
-  delete("/#{version_path}/portfolios/valid_id/consumers/valid_id") { status 204 }
-  delete("/#{version_path}/portfolios/invalid_id/consumers/invalid_id") { json_response 404, 'resource_not_found.json' }
+  delete("/#{version}/portfolios/valid_id/consumers/valid_id") { status 204 }
+  delete("/#{version}/portfolios/invalid_id/consumers/invalid_id") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # portfolios available consumers
-  get("/#{version_path}/portfolios/:id/consumers/available") do
+  get("/#{version}/portfolios/:id/consumers/available") do
     json_response 200, 'portfolios_available_consumers.json'
   end
 
   # consumers portfolios
-  get("/#{version_path}/consumers/valid_id/portfolios") { json_response 200, 'portfolios.json' }
-  get("/#{version_path}/consumers/invalid_id/portfolios") { json_response 404, 'resource_not_found.json' }
+  get("/#{version}/consumers/valid_id/portfolios") do
+    json_response 200, 'portfolios.json'
+  end
+  get("/#{version}/consumers/invalid_id/portfolios") do
+    json_response 404, 'resource_not_found.json'
+  end
 
   # portfolio reports
-  get("/#{version_path}/portfolio/reports") { json_response 200, 'portfolio_reports.json' }
+  get("/#{version}/portfolio/reports") do
+    json_response 200, 'portfolio_reports.json'
+  end
 
   # relevance
-  get("/#{version_path}/relevance/ruleset/names") { json_response 200, 'relevance_ruleset_names.json' }
+  get("/#{version}/relevance/ruleset/names") do
+    json_response 200, 'relevance_ruleset_names.json'
+  end
 
   # errors
-  get("/#{version_path}/client_error") { json_response 400, 'error.json' }
-  get("/#{version_path}/server_error") { status 500 }
-  get("/#{version_path}/proxy_error") { status 407 }
+  get("/#{version}/client_error") { json_response 400, 'error.json' }
+  get("/#{version}/server_error") { status 500 }
+  get("/#{version}/proxy_error") { status 407 }
 
   # timeout
-  get("/#{version_path}/orders/timeout") { status 419 }
+  get("/#{version}/orders/timeout") { status 419 }
 
   private