From d78a90e43cb872f0b93fdbecd753f8efd3fe3787 Mon Sep 17 00:00:00 2001 From: Aparna Karve Date: Mon, 22 May 2017 15:08:16 -0700 Subject: [PATCH] Remove all _verify related references in specs --- spec/controllers/ems_cloud_controller_spec.rb | 13 +-- .../controllers/ems_common_controller_spec.rb | 102 ------------------ .../ems_container_controller_spec.rb | 2 - .../ems_datawarehouse_controller_spec.rb | 3 - spec/controllers/ems_infra_controller_spec.rb | 19 ---- .../ems_middleware_controller_spec.rb | 3 - .../ems_physical_infra_controller_spec.rb | 5 - 7 files changed, 1 insertion(+), 146 deletions(-) diff --git a/spec/controllers/ems_cloud_controller_spec.rb b/spec/controllers/ems_cloud_controller_spec.rb index ea367f7e1be8..5bb341384f6a 100644 --- a/spec/controllers/ems_cloud_controller_spec.rb +++ b/spec/controllers/ems_cloud_controller_spec.rb @@ -34,13 +34,10 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]", "metrics_userid" => "", "metrics_password" => "[FILTERED]", - "metrics_verify" => "[FILTERED]", "amqp_userid" => "", "amqp_password" => "[FILTERED]", - "amqp_verify" => "[FILTERED]", "ssh_keypair_userid" => "", "ssh_keypair_password" => "[FILTERED]" } @@ -59,7 +56,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(1) @@ -78,7 +74,6 @@ "default_port" => "5000", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } @@ -100,7 +95,6 @@ "zone" => "default", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -116,7 +110,6 @@ "zone" => "default", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -131,7 +124,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -158,7 +150,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -179,7 +170,7 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]"} + } end it "creates openstack cloud manager with attributes from form" do @@ -218,7 +209,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -248,7 +238,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) diff --git a/spec/controllers/ems_common_controller_spec.rb b/spec/controllers/ems_common_controller_spec.rb index f5da3e1cc774..10be13b4e5ab 100644 --- a/spec/controllers/ems_common_controller_spec.rb +++ b/spec/controllers/ems_common_controller_spec.rb @@ -2,38 +2,6 @@ describe EmsCloudController do context "::EmsCommon" do - context "#get_form_vars" do - it "check if the default port for openstack/openstack_infra/rhevm is set" do - controller.instance_variable_set(:@edit, :new => {}) - controller.instance_variable_set(:@_params, :server_emstype => "openstack") - controller.send(:get_form_vars) - expect(assigns(:edit)[:new][:port]).to eq(5000) - - controller.instance_variable_set(:@_params, :server_emstype => "openstack_infra") - controller.send(:get_form_vars) - expect(assigns(:edit)[:new][:port]).to eq(5000) - - controller.instance_variable_set(:@_params, :server_emstype => "ec2") - controller.send(:get_form_vars) - expect(assigns(:edit)[:new][:port]).to be_nil - end - end - - context "#get_form_vars" do - it "check if provider_region gets reset when provider type is changed on add screen" do - controller.instance_variable_set(:@edit, :new => {}) - controller.instance_variable_set(:@_params, :server_emstype => "ec2") - controller.instance_variable_set(:@_params, :provider_region => "some_region") - - controller.send(:get_form_vars) - expect(assigns(:edit)[:new][:provider_region]).to eq("some_region") - - controller.instance_variable_set(:@_params, :server_emstype => "openstack") - controller.send(:get_form_vars) - expect(assigns(:edit)[:new][:provider_region]).to be_nil - end - end - context "#new" do before do stub_user(:features => :all) @@ -53,60 +21,6 @@ end end - context "#set_record_vars" do - context "strip leading/trailing whitespace from hostname/ipaddress" do - after :each do - stub_user(:features => :all) - controller.instance_variable_set(:@edit, :new => {:name => 'EMS 1', - :emstype => @type, - :hostname => ' 10.10.10.10 ', - :port => '5000'}, - :key => 'ems_edit__new') - session[:edit] = assigns(:edit) - controller.send(:set_record_vars, @ems) - expect(@ems.hostname).to eq('10.10.10.10') - end - - it "when adding cloud EMS" do - @type = 'openstack' - @ems = ManageIQ::Providers::Openstack::CloudManager.new - end - - it "when adding infra EMS" do - @type = 'rhevm' - @ems = ManageIQ::Providers::Redhat::InfraManager.new - end - end - end - - context "#update_button_validate" do - context "when authentication_check" do - let(:mocked_ems_cloud) { double(EmsCloud) } - before(:each) do - controller.instance_variable_set(:@_params, :id => "42", :type => "amqp") - expect(controller).to receive(:find_record_with_rbac).with(EmsCloud, "42").and_return(mocked_ems_cloud) - expect(controller).to receive(:set_record_vars).with(mocked_ems_cloud, :validate).and_return(mocked_ems_cloud) - end - - it "successful flash message (unchanged)" do - allow(controller).to receive_messages(:edit_changed? => false) - expect(mocked_ems_cloud).to receive(:authentication_check).with("amqp", :save => true).and_return([true, ""]) - expect(controller).to receive(:add_flash).with(_("Credential validation was successful")) - expect(controller).to receive(:render_flash) - controller.send(:update_button_validate) - end - - it "unsuccessful flash message (changed)" do - allow(controller).to receive_messages(:edit_changed? => true) - expect(mocked_ems_cloud).to receive(:authentication_check) - .with("amqp", :save => false).and_return([false, "Invalid"]) - expect(controller).to receive(:add_flash).with(_("Credential validation was not successful: Invalid"), :error) - expect(controller).to receive(:render_flash) - controller.send(:update_button_validate) - end - end - end - context "#button" do before(:each) do stub_user(:features => :all) @@ -346,22 +260,6 @@ def test_setting_few_fields link = controller.send(:show_link, ems, :display => "vms") expect(link).to eq("/ems_infra/#{ems.id}?display=vms") end - - context "#restore_password" do - it "populates the password from the ems record if params[:restore_password] exists" do - infra_ems = EmsInfra.new - allow(infra_ems).to receive(:authentication_password).and_return("default_password") - edit = {:ems_id => infra_ems.id, :new => {}} - controller.instance_variable_set(:@edit, edit) - controller.instance_variable_set(:@ems, infra_ems) - controller.instance_variable_set(:@_params, - :restore_password => true, - :default_password => "[FILTERED]", - :default_verify => "[FILTERED]") - controller.send(:restore_password) - expect(assigns(:edit)[:new][:default_password]).to eq(infra_ems.authentication_password) - end - end end include_examples '#download_summary_pdf', :ems_openstack_infra end diff --git a/spec/controllers/ems_container_controller_spec.rb b/spec/controllers/ems_container_controller_spec.rb index 160dcc433930..ebb0433cae34 100644 --- a/spec/controllers/ems_container_controller_spec.rb +++ b/spec/controllers/ems_container_controller_spec.rb @@ -74,7 +74,6 @@ "default_api_port" => "5000", "default_userid" => "", "default_password" => "", - "default_verify" => "", "provider_region" => "", "metrics_selection" => "hawkular_disabled" } @@ -95,7 +94,6 @@ "default_api_port" => "5000", "default_userid" => "", "default_password" => "", - "default_verify" => "", "provider_region" => "", "metrics_selection" => "hawkular_enabled", "hawkular_security_protocol" => "ssl-without-validation", diff --git a/spec/controllers/ems_datawarehouse_controller_spec.rb b/spec/controllers/ems_datawarehouse_controller_spec.rb index 4ef4ab93f68d..e33762584dea 100644 --- a/spec/controllers/ems_datawarehouse_controller_spec.rb +++ b/spec/controllers/ems_datawarehouse_controller_spec.rb @@ -54,7 +54,6 @@ "default_api_port" => "443", "default_userid" => "", "default_password" => "VERY_SECRET", - "default_verify" => "VERY_SECRET", } end.to change { ManageIQ::Providers::Hawkular::DatawarehouseManager.count }.by(1) end @@ -70,7 +69,6 @@ "default_hostname" => "lotsofdata.com", "default_userid" => "", "default_password" => "VERY_SECRET", - "default_verify" => "VERY_SECRET" } end.to change { Authentication.count }.by(1) @@ -88,7 +86,6 @@ "default_hostname" => "host_hawkular_updated", "default_userid" => "", "default_password" => "MUCH_WOW", - "default_verify" => "MUCH_WOW" } end.not_to change { Authentication.count } diff --git a/spec/controllers/ems_infra_controller_spec.rb b/spec/controllers/ems_infra_controller_spec.rb index e7dfc554ca66..053dc426125e 100644 --- a/spec/controllers/ems_infra_controller_spec.rb +++ b/spec/controllers/ems_infra_controller_spec.rb @@ -450,7 +450,6 @@ "default_security_protocol" => "ssl", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { ManageIQ::Providers::Microsoft::InfraManager.count }.by(1) end @@ -467,7 +466,6 @@ "default_security_protocol" => "ssl", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(1) @@ -484,7 +482,6 @@ "emstype" => "scvmm", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } @@ -501,7 +498,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -516,7 +512,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -545,19 +540,16 @@ "default_security_protocol" => "ssl", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]", "amqp_hostname" => "foo_amqp.com", "amqp_api_port" => "5672", "amqp_security_protocol" => "ssl", "amqp_userid" => "amqp_foo", "amqp_password" => "[FILTERED]", - "amqp_verify" => "[FILTERED]", "ssh_keypair_hostname" => "foo_ssh.com", "ssh_keypair_port" => "5372", "ssh_keypair_security_protocol" => "ssl", "ssh_keypair_userid" => "ssh_foo", "ssh_keypair_password" => "[FILTERED]", - "ssh_keypair_verify" => "[FILTERED]" } end.to change { ManageIQ::Providers::Openstack::InfraManager.count }.by(1) end @@ -575,19 +567,16 @@ "default_security_protocol" => "ssl", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]", "amqp_hostname" => "foo_amqp.com", "amqp_api_port" => "5672", "amqp_security_protocol" => "ssl", "amqp_userid" => "amqp_foo", "amqp_password" => "[FILTERED]", - "amqp_verify" => "[FILTERED]", "ssh_keypair_hostname" => "foo_ssh.com", "ssh_keypair_port" => "5372", "ssh_keypair_security_protocol" => "ssl", "ssh_keypair_userid" => "ssh_foo", "ssh_keypair_password" => "[FILTERED]", - "ssh_keypair_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(3) @@ -604,7 +593,6 @@ "emstype" => "openstack_infra", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } @@ -635,12 +623,10 @@ "default_api_port" => "5000", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]", "metrics_hostname" => "foo_metrics.com", "metrics_api_port" => "5672", "metrics_userid" => "metrics_foo", "metrics_password" => "[FILTERED]", - "metrics_verify" => "[FILTERED]", "metrics_database_name" => "metrics_dwh" } end @@ -675,7 +661,6 @@ "emstype" => "rhevm", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } @@ -700,7 +685,6 @@ "metrics_api_port" => "5672", "metrics_userid" => "metrics_foo", "metrics_password" => "[FILTERED]", - "metrics_verify" => "[FILTERED]", "metrics_database_name" => "metrics_dwh_updated" } @@ -743,7 +727,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { ManageIQ::Providers::Vmware::InfraManager.count }.by(1) end @@ -759,7 +742,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(1) @@ -776,7 +758,6 @@ "emstype" => "vmwarews", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } diff --git a/spec/controllers/ems_middleware_controller_spec.rb b/spec/controllers/ems_middleware_controller_spec.rb index aee472f838a9..c814a76c1bf5 100644 --- a/spec/controllers/ems_middleware_controller_spec.rb +++ b/spec/controllers/ems_middleware_controller_spec.rb @@ -54,7 +54,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { ManageIQ::Providers::Hawkular::MiddlewareManager.count }.by(1) end @@ -70,7 +69,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(1) @@ -87,7 +85,6 @@ "emstype" => "hawkular", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } diff --git a/spec/controllers/ems_physical_infra_controller_spec.rb b/spec/controllers/ems_physical_infra_controller_spec.rb index 1ec90a7bdc79..c6e0a6144fed 100644 --- a/spec/controllers/ems_physical_infra_controller_spec.rb +++ b/spec/controllers/ems_physical_infra_controller_spec.rb @@ -150,7 +150,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { ManageIQ::Providers::PhysicalInfraManager.count }.by(1) end @@ -166,7 +165,6 @@ "default_hostname" => "foo.com", "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.to change { Authentication.count }.by(1) @@ -183,7 +181,6 @@ "emstype" => "lenovo_ph_infra", "default_userid" => "bar", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } end.not_to change { Authentication.count } @@ -200,7 +197,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200) @@ -215,7 +211,6 @@ "zone" => zone.name, "default_userid" => "foo", "default_password" => "[FILTERED]", - "default_verify" => "[FILTERED]" } expect(response.status).to eq(200)