diff --git a/spec/requests/api/article_categories_spec.rb b/spec/requests/api/article_categories_spec.rb index 68467241..937f2690 100644 --- a/spec/requests/api/article_categories_spec.rb +++ b/spec/requests/api/article_categories_spec.rb @@ -33,7 +33,7 @@ describe 'Article Categories', type: :request do get 'find article category by id' do tags 'Category' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param response '200', 'article category found' do schema type: :object, properties: { diff --git a/spec/requests/api/financial_transaction_classes_spec.rb b/spec/requests/api/financial_transaction_classes_spec.rb index 8b62a721..9e0bd1a6 100644 --- a/spec/requests/api/financial_transaction_classes_spec.rb +++ b/spec/requests/api/financial_transaction_classes_spec.rb @@ -35,7 +35,7 @@ describe 'Financial Transaction Classes', type: :request do get 'Retrieves a financial transaction class' do tags 'Category' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param response '200', 'financial transaction class found' do schema type: :object, properties: { diff --git a/spec/requests/api/financial_transaction_types_spec.rb b/spec/requests/api/financial_transaction_types_spec.rb index 2e737f7e..94caacf4 100644 --- a/spec/requests/api/financial_transaction_types_spec.rb +++ b/spec/requests/api/financial_transaction_types_spec.rb @@ -33,7 +33,7 @@ describe 'Financial Transaction types', type: :request do get 'find financial transaction type by id' do tags 'Category' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param response '200', 'financial transaction type found' do schema type: :object, properties: { diff --git a/spec/requests/api/financial_transactions_spec.rb b/spec/requests/api/financial_transactions_spec.rb index b3f3a85d..aa9afaeb 100644 --- a/spec/requests/api/financial_transactions_spec.rb +++ b/spec/requests/api/financial_transactions_spec.rb @@ -37,7 +37,7 @@ describe 'Financial Transaction', type: :request do get 'Retrieves a financial transaction ' do tags 'Financial Transaction' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param response '200', 'financial transaction found' do schema type: :object, properties: { diff --git a/spec/requests/api/order_articles_spec.rb b/spec/requests/api/order_articles_spec.rb index 50774110..88c68b0a 100644 --- a/spec/requests/api/order_articles_spec.rb +++ b/spec/requests/api/order_articles_spec.rb @@ -105,7 +105,7 @@ describe 'Order Articles', type: :request do get 'order articles' do tags 'Order' produces 'application/json' - parameter name: 'id', in: :path, type: :integer, minimum: 1, required: true + id_url_param let(:api_scopes) { ['orders:read', 'orders:write'] } response '200', 'success' do diff --git a/spec/requests/api/orders_spec.rb b/spec/requests/api/orders_spec.rb index 43f546a3..05eea3e2 100644 --- a/spec/requests/api/orders_spec.rb +++ b/spec/requests/api/orders_spec.rb @@ -39,7 +39,8 @@ describe 'Orders', type: :request do get 'Order' do tags 'Order' produces 'application/json' - parameter name: 'id', in: :path, type: :integer, minimum: 1, required: true + id_url_param + let(:order) { create(:order) } let(:id) { order.id } diff --git a/spec/requests/api/user/financial_transactions_spec.rb b/spec/requests/api/user/financial_transactions_spec.rb index a0dad6ff..1eca1895 100644 --- a/spec/requests/api/user/financial_transactions_spec.rb +++ b/spec/requests/api/user/financial_transactions_spec.rb @@ -88,7 +88,7 @@ describe 'User', type: :request do get 'find financial transaction by id' do tags 'User', 'Financial Transaction' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param response '200', 'success' do schema type: :object, properties: { diff --git a/spec/requests/api/user/group_order_articles_spec.rb b/spec/requests/api/user/group_order_articles_spec.rb index 55e44dd1..e451fb10 100644 --- a/spec/requests/api/user/group_order_articles_spec.rb +++ b/spec/requests/api/user/group_order_articles_spec.rb @@ -107,9 +107,8 @@ describe 'User', type: :request do get 'find group order article by id' do tags 'User', 'GroupOrderArticle' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param - let(:id) { goa.id } response '200', 'success' do schema type: :object, properties: { group_order_article: { @@ -119,6 +118,7 @@ describe 'User', type: :request do } } } + let(:id) { goa.id } run_test! do |response| data = JSON.parse(response.body) expect(data['group_order_article']['id']).to eq(goa.id) @@ -155,7 +155,7 @@ describe 'User', type: :request do tags 'User', 'GroupOrderArticle' consumes 'application/json' produces 'application/json' - parameter name: :id, in: :path, type: :string + id_url_param parameter name: :group_order_article, in: :body, schema: { type: :object, @@ -219,11 +219,9 @@ describe 'User', type: :request do tags 'User', 'Order' consumes 'application/json' produces 'application/json' + id_url_param let(:api_scopes) { ['group_orders:user'] } - parameter name: :id, in: :path, type: :string - - let(:id) { goa.id } response '200', 'success' do schema type: :object, properties: { group_order_article: { @@ -233,6 +231,7 @@ describe 'User', type: :request do } } } + let(:id) { goa.id } run_test! end diff --git a/spec/support/api_helper.rb b/spec/support/api_helper.rb index 0c8c83d5..233f6584 100644 --- a/spec/support/api_helper.rb +++ b/spec/support/api_helper.rb @@ -67,5 +67,9 @@ module ApiHelper it_handles_invalid_token(*args) it_handles_invalid_scope(*args) end + + def self.id_url_param + parameter name: :id, in: :path, type: :integer, required: true + end end end