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

Jump to bottom

Display user info after clicking on Lookup while provisioning VM #6391

Merged
merged 1 commit into from Nov 15, 2019
Merged

Display user info after clicking on Lookup while provisioning VM #6391

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/miq_request_controller.rb
View file
Open in desktop
Expand Up @@ -265,8 +265,8 @@ def retrieve_email
else
render :update do |page|
page << javascript_prologue
page.replace_html("requester_div", :partial => "shared/views/prov_dialog",
:locals => {:wf => @edit[:wf], :dialog => :requester})
page.replace_html(:requester, :partial => "shared/views/prov_dialog",
:locals => {:wf => @edit[:wf], :dialog => :requester})
page.replace("flash_msg_div", :partial => "layouts/flash_msg")
end
end
Expand Down
106 changes: 61 additions & 45 deletions spec/controllers/miq_request_controller_spec.rb
View file
Open in desktop
@@ -1,8 +1,6 @@
describe MiqRequestController do
context "#post_install_callback should render nothing" do
before do
EvmSpecHelper.create_guid_miq_server_zone
end
describe "#post_install_callback should render nothing" do
before { EvmSpecHelper.create_guid_miq_server_zone }

it "when called with a task id" do
expect(MiqRequestTask).to receive(:post_install_callback).with("12345").once
Expand Down Expand Up @@ -50,39 +48,39 @@
before { login_as user }

context "created_on" do
let(:options) do
{ :time_period => 9 }
end
let(:options) { {:time_period => 9} }

it { is_expected.to include [:created_recently, 9] }
end

context "requester_id" do
context "logged as an approver" do
it { is_expected.not_to include [:with_requester, user.id] }
end

context "logged without approval privileges" do
let(:user) { FactoryBot.create(:user, :features => "none") }

it { is_expected.to include [:with_requester, user.id] }
end

context "selected 'another_user'" do
let(:another_user) { FactoryBot.create(:user) }
let(:options) do
{ :user_choice => another_user.id }
end
let(:options) { {:user_choice => another_user.id} }

it { is_expected.to include [:with_requester, another_user.id] }
end

context "selected 'all'" do
let(:options) do
{ :user_choice => 'all' }
end
let(:options) { {:user_choice => 'all'} }

it { expect(subject.collect(&:first)).not_to include :with_requester }
end
end

context "approval_state" do
let(:options) do
{ :applied_states => %w(state_1 state_2) }
end
let(:options) { {:applied_states => %w[state_1 state_2]} }

it { is_expected.to include [:with_approval_state, %w(state_1 state_2)] }
end

Expand All @@ -92,25 +90,23 @@

context "request_type" do
context "selected '1'" do
let(:options) do
{ :type_choice => "1" }
end
let(:options) { {:type_choice => "1"} }

it { is_expected.to include [:with_request_type, "1"] }
end

context "selected 'all'" do
let(:options) do
{ :type_choice => "all" }
end
let(:options) { {:type_choice => "all"} }

it { is_expected.not_to include [:with_request_type, "all"] }
end
end

context "reason" do
%w(*starts_with *includes* ends_with*).each do |pattern|
%w[*starts_with *includes* ends_with*].each do |pattern|
context "is matched to '#{pattern}'" do
let(:options) do
{ :reason_text => pattern }
end
let(:options) { {:reason_text => pattern} }

it { is_expected.to include [:with_reason_like, pattern] }
end
end
Expand All @@ -121,14 +117,15 @@
end
end

context "#button" do
describe "#button" do
before do
stub_user(:features => :all)
EvmSpecHelper.create_guid_miq_server_zone
@miq_request = MiqProvisionConfiguredSystemRequest.create(:description => "Foreman provision",
:approval_state => "pending_approval",
:requester => User.current_user)
end

it "when edit request button is pressed" do
post :button, :params => { :pressed => "miq_request_edit", :id => @miq_request.id, :format => :js }
expect(response.status).to eq(200)
Expand Down Expand Up @@ -212,28 +209,33 @@

context 'filters by created_on' do
let(:scope) { [[:created_recently, 14]] }

it { is_expected.to eq(2) }
end

context 'filters by requester_id' do
let(:scope) { [[:with_requester, user1.id]] }

it { is_expected.to eq(2) }
end

context 'filters by approval_state' do
let(:scope) { [[:with_approval_state, %w(approved pending_approval)]] }
let(:scope) { [[:with_approval_state, %w[approved pending_approval]]] }

it { is_expected.to eq(2) }
end

context 'filters by request_type' do
let(:scope) { [[:with_request_type, %w(clone_to_vm clone_to_template)]] }
let(:scope) { [[:with_request_type, %w[clone_to_vm clone_to_template]]] }

it { is_expected.to eq(2) }
end

context 'filters by reason' do
%w(*cd cd* *cde*).each do |reason|
context "'#{reason}'" do
let(:scope) { [[:with_reason_like, reason]] }

it { is_expected.to eq(2) }
end
end
Expand Down Expand Up @@ -298,6 +300,7 @@

context 'angular for grid with affected VMs is properly initialized' do
let(:additional_key) { :report_data_additional_options }

it do
expect(controller).to receive(:prov_set_show_vars).once.and_call_original

Expand All @@ -311,6 +314,7 @@

context 'angular for grid with affected VMs gets the correct VMs with XHR call' do
let(:additional_key) { :additional_options }

it do
post :report_data, :params => payload
expect(response.status).to eq(200)
Expand Down Expand Up @@ -348,6 +352,7 @@

context 'angular for grid with affected PhysicalServers is properly initialized' do
let(:additional_key) { :report_data_additional_options }

it do
expect(controller).to receive(:prov_set_show_vars).once.and_call_original

Expand All @@ -361,6 +366,7 @@

context 'angular for grid with affected PhysicalServers gets the correct objects with XHR call' do
let(:additional_key) { :additional_options }

it do
post :report_data, :params => payload.merge(:records => [server1.id])
expect(response.status).to eq(200)
Expand All @@ -371,14 +377,15 @@
end
end

context "#edit_button" do
describe "#edit_button" do
before do
stub_user(:features => :all)
EvmSpecHelper.create_guid_miq_server_zone
@miq_request = MiqProvisionConfiguredSystemRequest.create(:description => "Foreman provision",
:approval_state => "pending_approval",
:requester => User.current_user)
end

it "when the edit button is pressed the request is displayed" do
session[:settings] = {:display => {:quad_truncate => 'f'}}
get :show, :params => { :id => @miq_request.id }
Expand All @@ -387,7 +394,7 @@
end
end

context "#layout_from_tab_name" do
describe "#layout_from_tab_name" do
before do
stub_user(:features => :all)
EvmSpecHelper.create_guid_miq_server_zone
Expand All @@ -402,7 +409,7 @@
end
end

context '#filter' do
describe '#filter' do
before { stub_user(:features => :all) }

it 'returns a scope for the GTL' do
Expand All @@ -413,7 +420,7 @@
end
end

context '#miq_request_initial_options' do
describe '#miq_request_initial_options' do
before { stub_user(:features => :all) }
subject { controller.send(:miq_request_initial_options) }

Expand All @@ -433,7 +440,7 @@
end
end

context '#miq_request_initial_options user choice' do
describe '#miq_request_initial_options user choice' do
before do
EvmSpecHelper.local_miq_server
stub_settings(:server => {}, :session => {})
Expand Down Expand Up @@ -473,7 +480,7 @@
end
end

context "requester_label" do
describe "#requester_label" do
before do
EvmSpecHelper.local_miq_server
stub_settings(:server => {}, :session => {})
Expand All @@ -498,6 +505,21 @@
end
end

describe '#retrieve_email' do
let(:wf) { FactoryBot.create(:miq_provision_virt_workflow) }

before do
allow(controller).to receive(:session).and_return(:edit => {:wf => wf})
controller.params = {:field => 'retrieve_ldap'}
end

it 'calls render method and sets @edit according to the session' do
expect(controller).to receive(:render).with(:update)
controller.send(:retrieve_email)
expect(controller.instance_variable_get(:@edit)).to eq(:wf => wf)
end
end

private

def create_user_in_other_region(userid)
Expand All @@ -512,10 +534,8 @@ def requestor_expression_for_two_users(user1, user2)
{"=" => {"value" => user2.id, "field" => "MiqRequest-requester_id"}}]
end

describe "breadcrumbs_options" do
let(:miq_request) do
FactoryBot.create(:miq_provision_request, :with_approval, :description => 'Description of request')
end
describe "#breadcrumbs_options" do
let(:miq_request) { FactoryBot.create(:miq_provision_request, :with_approval, :description => 'Description of request') }

it "returns item's breadcrumb on action page" do
controller.params = {:req_id => miq_request.id} # simulate action with id (edit, copy, etc.)
Expand All @@ -532,9 +552,7 @@ def requestor_expression_for_two_users(user1, user2)
end

context "when request type is clone_to_template" do
let(:request) do
FactoryBot.create(:miq_provision_request, :with_approval, :request_type => "clone_to_vm")
end
let(:request) { FactoryBot.create(:miq_provision_request, :with_approval, :request_type => "clone_to_vm") }

it "returns header including Publish" do
get :prov_edit, :params => {:prov_id => request.id, :prov_type => "clone_to_template"}
Expand All @@ -545,9 +563,7 @@ def requestor_expression_for_two_users(user1, user2)
end

context "when no request type" do
let(:request) do
FactoryBot.create(:miq_provision_request, :with_approval)
end
let(:request) { FactoryBot.create(:miq_provision_request, :with_approval) }

it "returns header including Edit" do
get :prov_edit, :params => {:req_id => request.id}
Expand Down