From 5201d1740ce0e78ea1d07a34e9a8b92913009002 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 12 Dec 2022 16:59:17 +0100 Subject: [PATCH] refactor: q ordered article parameter --- spec/requests/api/order_articles_spec.rb | 13 ++----------- spec/support/api_helper.rb | 6 ++++++ spec/swagger_helper.rb | 9 +++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/spec/requests/api/order_articles_spec.rb b/spec/requests/api/order_articles_spec.rb index a129c438..2285fff6 100644 --- a/spec/requests/api/order_articles_spec.rb +++ b/spec/requests/api/order_articles_spec.rb @@ -9,17 +9,8 @@ describe 'Order Articles', type: :request do produces 'application/json' parameter name: "per_page", in: :query, type: :integer, required: false parameter name: "page", in: :query, type: :integer, required: false - parameter name: 'q', in: :query, required: false, - description: "'member' show articles ordered by the user's ordergroup, 'all' by all members, and 'supplier' ordered at the supplier", - schema: { - type: :object, - properties: { - ordered: { - type: :string, - enum: %w[member all supplier] - } - } - } + q_ordered_url_param + let(:api_scopes) { ['orders:read', 'orders:write'] } let(:order) { create(:order, article_count: 4) } let(:order_articles) { order.order_articles } diff --git a/spec/support/api_helper.rb b/spec/support/api_helper.rb index 0727356b..98732a19 100644 --- a/spec/support/api_helper.rb +++ b/spec/support/api_helper.rb @@ -70,5 +70,11 @@ module ApiHelper def self.id_url_param parameter name: :id, in: :path, type: :integer, required: true end + + def self.q_ordered_url_param + parameter name: 'q', in: :query, required: false, + description: "'member' show articles ordered by the user's ordergroup, 'all' by all members, and 'supplier' ordered at the supplier", + schema: { '$ref' => '#/components/schemas/q_ordered' } + end end end diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb index df863208..912504b8 100644 --- a/spec/swagger_helper.rb +++ b/spec/swagger_helper.rb @@ -351,6 +351,15 @@ RSpec.configure do |config| } ] }, + q_ordered: { + type: :object, + properties: { + ordered: { + type: :string, + enum: %w[member all supplier] + } + } + }, Meta: { type: :object, properties: {