Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure ServiceTemplate ordering passes through the submit_workflow flag #504

Merged
merged 1 commit into from
Oct 31, 2018
Merged

Ensure ServiceTemplate ordering passes through the submit_workflow flag #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/api/mixins/service_templates.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ def request_from_ui?

def order_request_options
init_defaults = !request_from_ui? && Settings.product.run_automate_methods_on_service_api_submit
submit_workflow = request_from_ui? || Settings.product.allow_api_service_ordering

{:submit_workflow => request_from_ui?, :init_defaults => init_defaults}
{:submit_workflow => submit_workflow, :init_defaults => init_defaults}
end

def token_info
Expand Down
19 changes: 19 additions & 0 deletions spec/requests/service_templates_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,25 @@
end

context "with an orderable template" do
context "when the request headers do not indicate that the request is coming from the UI" do
before do
request_headers.delete("x-auth-token")
end

it "orders the request with 'submit_workflow' set to true" do
api_basic_authorize action_identifier(:service_templates, :order, :resource_actions, :post)

post(api_service_templates_url, :params => { :action => "order", :resources => [{:href => api_service_template_url(nil, service_template)}] })

expected = {
"results" => [a_hash_including("href" => a_string_including(api_service_requests_url),
"options" => a_hash_including("request_options" => a_hash_including("submit_workflow"=>true)))]
}
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(expected)
end
end

it "can be ordered as a resource action" do
api_basic_authorize action_identifier(:service_templates, :order, :resource_actions, :post)

Expand Down