diff --git a/spec/requests/requests_spec.rb b/spec/requests/requests_spec.rb index f9a20d494c..83a6278ce8 100644 --- a/spec/requests/requests_spec.rb +++ b/spec/requests/requests_spec.rb @@ -263,14 +263,12 @@ request.add_tag(t.name, t.children.first.name) api_basic_authorize action_identifier(:requests, :read, :resource_actions, :get) - get api_request_url(nil, request), :params => { :attributes => "workflow,v_allowed_tags,v_workflow_class" } + get api_request_url(nil, request), :params => {:attributes => "workflow,v_allowed_tags"} expected_response = a_hash_including( - "id" => request.id.to_s, - "workflow" => a_hash_including("values"), - "v_allowed_tags" => [a_hash_including("children")], - "v_workflow_class" => a_hash_including( - "instance_logger" => a_hash_including("klass" => request.workflow.class.to_s)) + "id" => request.id.to_s, + "workflow" => a_hash_including("values"), + "v_allowed_tags" => [a_hash_including("children")] ) expect(response.parsed_body).to match(expected_response) @@ -314,11 +312,10 @@ :source_type => vm_template.class.name) api_basic_authorize action_identifier(:requests, :read, :resource_actions, :get) - get api_request_url(nil, request), :params => { :attributes => "workflow,v_allowed_tags,v_workflow_class" } + get api_request_url(nil, request), :params => {:attributes => "workflow,v_allowed_tags"} expected_response = a_hash_including( - "id" => request.id.to_s, - "v_workflow_class" => {} + "id" => request.id.to_s ) expect(response.parsed_body).to match(expected_response) diff --git a/spec/requests/servers_spec.rb b/spec/requests/servers_spec.rb index 26df3d8d9e..f33677fe25 100644 --- a/spec/requests/servers_spec.rb +++ b/spec/requests/servers_spec.rb @@ -110,7 +110,7 @@ server = FactoryBot.create(:miq_server, :status => 'started') expect { post(api_server_url(nil, server), :params => gen_request(:delete)) }.to change(MiqServer, :count).by(0) - expect_single_action_result(:success => false, :message => 'Failed to destroy the record') + expect_single_action_result(:success => false, :message => 'Failed to destroy') end it "can delete a server with DELETE if the server is deletable" do