-
Notifications
You must be signed in to change notification settings - Fork 141
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.
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
Add archive/unarchive actions to ServiceTemplate #389
Merged
abellotti
merged 1 commit into
ManageIQ:master
from
agrare:archive_unarchive_service_template
Jun 5, 2018
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -548,4 +548,122 @@ | |
end | ||
end | ||
end | ||
|
||
describe "Service Templates archive" do | ||
let(:service_template) { FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) } | ||
|
||
it "is forbidden without appropriate role" do | ||
api_basic_authorize | ||
|
||
post(api_service_template_url(nil, service_template), :params => { :action => "archive" }) | ||
|
||
expect(response).to have_http_status(:forbidden) | ||
end | ||
|
||
it "can be archived as a resource action" do | ||
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post) | ||
|
||
post(api_service_template_url(nil, service_template), :params => { :action => "archive" }) | ||
|
||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include("message" => "Archived Service Template") | ||
end | ||
|
||
it "can be archived as an action on the collection" do | ||
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post) | ||
|
||
post(api_service_templates_url, :params => { :action => "archive", :resources => [{:href => api_service_template_url(nil, service_template)}] }) | ||
|
||
expected = { | ||
"results" => [a_hash_including("message" => "Archived Service Template")] | ||
} | ||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include(expected) | ||
end | ||
|
||
it "shows the action" do | ||
api_basic_authorize(action_identifier(:service_templates, :archive, :resource_actions, :post), | ||
action_identifier(:service_templates, :read, :resource_actions, :get)) | ||
|
||
get(api_service_template_url(nil, service_template)) | ||
|
||
actions = response.parsed_body["actions"].collect { |action| action["name"] } | ||
expect(actions).to include("archive") | ||
end | ||
|
||
it "can archive multiple service templates" do | ||
service_template2 = FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) | ||
api_basic_authorize action_identifier(:service_templates, :archive, :resource_actions, :post) | ||
|
||
post(api_service_templates_url, :params => { :action => "archive", :resources => | ||
[{:href => api_service_template_url(nil, service_template)}, | ||
{:href => api_service_template_url(nil, service_template2)}]}) | ||
|
||
expected = { | ||
"results" => [a_hash_including("message" => "Archived Service Template"), | ||
a_hash_including("message" => "Archived Service Template")] | ||
} | ||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include(expected) | ||
end | ||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we also need another set of the above tests for unarchive. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
|
||
describe "Service Templates unarchive" do | ||
let(:service_template) { FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) } | ||
|
||
it "is forbidden without appropriate role" do | ||
api_basic_authorize | ||
|
||
post(api_service_template_url(nil, service_template), :params => { :action => "unarchive" }) | ||
|
||
expect(response).to have_http_status(:forbidden) | ||
end | ||
|
||
it "can be unarchived as a resource action" do | ||
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post) | ||
|
||
post(api_service_template_url(nil, service_template), :params => { :action => "unarchive" }) | ||
|
||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include("message" => "Unarchived Service Template") | ||
end | ||
|
||
it "can be unarchived as an action on the collection" do | ||
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post) | ||
|
||
post(api_service_templates_url, :params => { :action => "unarchive", :resources => [{:href => api_service_template_url(nil, service_template)}] }) | ||
|
||
expected = { | ||
"results" => [a_hash_including("message" => "Unarchived Service Template")] | ||
} | ||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include(expected) | ||
end | ||
|
||
it "shows the action" do | ||
api_basic_authorize(action_identifier(:service_templates, :unarchive, :resource_actions, :post), | ||
action_identifier(:service_templates, :read, :resource_actions, :get)) | ||
|
||
get(api_service_template_url(nil, service_template)) | ||
|
||
actions = response.parsed_body["actions"].collect { |action| action["name"] } | ||
expect(actions).to include("unarchive") | ||
end | ||
|
||
it "can unarchive multiple service templates" do | ||
service_template2 = FactoryGirl.create(:service_template, :with_provision_resource_action_and_dialog) | ||
api_basic_authorize action_identifier(:service_templates, :unarchive, :resource_actions, :post) | ||
|
||
post(api_service_templates_url, :params => { :action => "unarchive", :resources => | ||
[{:href => api_service_template_url(nil, service_template)}, | ||
{:href => api_service_template_url(nil, service_template2)}]}) | ||
|
||
expected = { | ||
"results" => [a_hash_including("message" => "Unarchived Service Template"), | ||
a_hash_including("message" => "Unarchived Service Template")] | ||
} | ||
expect(response).to have_http_status(:ok) | ||
expect(response.parsed_body).to include(expected) | ||
end | ||
end | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the other failures might be because svc_catalog_archive and svc_catalog_unarchive are not mid_product_feature.yml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think this was actually related to #389 (comment) since I had ManageIQ/manageiq#17518 applied locally when testing and this still failed.