From bfde33c62a513f9062e2d1a2d0e10c6c5d1058e0 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Thu, 14 Dec 2017 13:51:58 -0500 Subject: [PATCH] Require all files under spec/shared in the engine in spec_helper --- spec/presenters/tree_node/assigned_server_role_spec.rb | 3 --- spec/presenters/tree_node/availability_zone_spec.rb | 2 -- spec/presenters/tree_node/chargeback_rate_spec.rb | 2 -- spec/presenters/tree_node/classification_spec.rb | 2 -- spec/presenters/tree_node/compliance_detail_spec.rb | 2 -- spec/presenters/tree_node/compliance_spec.rb | 2 -- spec/presenters/tree_node/condition_spec.rb | 2 -- spec/presenters/tree_node/configuration_profile_spec.rb | 2 -- spec/presenters/tree_node/configuration_script_base_spec.rb | 2 -- spec/presenters/tree_node/configured_system_spec.rb | 2 -- spec/presenters/tree_node/container_spec.rb | 2 -- spec/presenters/tree_node/custom_button_set_spec.rb | 2 -- spec/presenters/tree_node/custom_button_spec.rb | 2 -- spec/presenters/tree_node/customization_template_spec.rb | 2 -- spec/presenters/tree_node/dialog_field_spec.rb | 2 -- spec/presenters/tree_node/dialog_group_spec.rb | 2 -- spec/presenters/tree_node/dialog_spec.rb | 2 -- spec/presenters/tree_node/dialog_tab_spec.rb | 2 -- spec/presenters/tree_node/ems_cluster_spec.rb | 2 -- spec/presenters/tree_node/ems_folder_spec.rb | 2 -- spec/presenters/tree_node/ext_management_system_spec.rb | 2 -- spec/presenters/tree_node/guest_device_spec.rb | 2 -- spec/presenters/tree_node/host_spec.rb | 2 -- spec/presenters/tree_node/iso_datastore_spec.rb | 2 -- spec/presenters/tree_node/iso_image_spec.rb | 2 -- spec/presenters/tree_node/lan_spec.rb | 2 -- spec/presenters/tree_node/ldap_domain_spec.rb | 2 -- spec/presenters/tree_node/ldap_region_spec.rb | 2 -- spec/presenters/tree_node/miq_action_spec.rb | 2 -- spec/presenters/tree_node/miq_ae_class_spec.rb | 2 -- spec/presenters/tree_node/miq_ae_instance_spec.rb | 2 -- spec/presenters/tree_node/miq_ae_method_spec.rb | 2 -- spec/presenters/tree_node/miq_ae_namespace_spec.rb | 2 -- spec/presenters/tree_node/miq_alert_set_spec.rb | 2 -- spec/presenters/tree_node/miq_alert_spec.rb | 2 -- spec/presenters/tree_node/miq_dialog_spec.rb | 2 -- spec/presenters/tree_node/miq_event_definition_spec.rb | 2 -- spec/presenters/tree_node/miq_group_spec.rb | 2 -- spec/presenters/tree_node/miq_policy_set_spec.rb | 2 -- spec/presenters/tree_node/miq_policy_spec.rb | 2 -- spec/presenters/tree_node/miq_region_spec.rb | 2 -- spec/presenters/tree_node/miq_report_result_spec.rb | 2 -- spec/presenters/tree_node/miq_report_spec.rb | 2 -- spec/presenters/tree_node/miq_schedule_spec.rb | 2 -- spec/presenters/tree_node/miq_scsi_lun_spec.rb | 2 -- spec/presenters/tree_node/miq_scsi_target_spec.rb | 2 -- spec/presenters/tree_node/miq_search_spec.rb | 2 -- spec/presenters/tree_node/miq_server_spec.rb | 2 -- spec/presenters/tree_node/miq_user_role_spec.rb | 2 -- spec/presenters/tree_node/miq_widget_set_spec.rb | 2 -- spec/presenters/tree_node/miq_widget_spec.rb | 2 -- spec/presenters/tree_node/orchestration_template_spec.rb | 2 -- spec/presenters/tree_node/pxe_image_spec.rb | 2 -- spec/presenters/tree_node/pxe_image_type_spec.rb | 2 -- spec/presenters/tree_node/pxe_server_spec.rb | 2 -- spec/presenters/tree_node/resource_pool_spec.rb | 2 -- spec/presenters/tree_node/scan_item_set_spec.rb | 2 -- spec/presenters/tree_node/server_role_spec.rb | 3 --- spec/presenters/tree_node/service_resource_spec.rb | 2 -- spec/presenters/tree_node/service_spec.rb | 2 -- spec/presenters/tree_node/service_template_catalog_spec.rb | 2 -- spec/presenters/tree_node/service_template_spec.rb | 2 -- spec/presenters/tree_node/snapshot_spec.rb | 2 -- spec/presenters/tree_node/storage_spec.rb | 2 -- spec/presenters/tree_node/switch_spec.rb | 2 -- spec/presenters/tree_node/tenant_spec.rb | 2 -- spec/presenters/tree_node/user_spec.rb | 2 -- spec/presenters/tree_node/vm_or_template_spec.rb | 2 -- spec/presenters/tree_node/vmdb_index_spec.rb | 2 -- spec/presenters/tree_node/vmdb_table_spec.rb | 2 -- spec/presenters/tree_node/windows_image_spec.rb | 2 -- spec/presenters/tree_node/zone_spec.rb | 2 -- spec/spec_helper.rb | 3 +-- 73 files changed, 1 insertion(+), 148 deletions(-) diff --git a/spec/presenters/tree_node/assigned_server_role_spec.rb b/spec/presenters/tree_node/assigned_server_role_spec.rb index 8a6b5ed78f8..6d71da421b0 100644 --- a/spec/presenters/tree_node/assigned_server_role_spec.rb +++ b/spec/presenters/tree_node/assigned_server_role_spec.rb @@ -1,6 +1,3 @@ -require 'shared/presenters/tree_node/common' -require 'shared/presenters/tree_node/server_roles' - describe TreeNode::AssignedServerRole do include_context 'server roles' let(:object) { assigned_server_role } diff --git a/spec/presenters/tree_node/availability_zone_spec.rb b/spec/presenters/tree_node/availability_zone_spec.rb index 6abc47eccec..67c616fd83b 100644 --- a/spec/presenters/tree_node/availability_zone_spec.rb +++ b/spec/presenters/tree_node/availability_zone_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::AvailabilityZone do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/chargeback_rate_spec.rb b/spec/presenters/tree_node/chargeback_rate_spec.rb index 44de6531a34..3bd8b49e81c 100644 --- a/spec/presenters/tree_node/chargeback_rate_spec.rb +++ b/spec/presenters/tree_node/chargeback_rate_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ChargebackRate do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:chargeback_rate) } diff --git a/spec/presenters/tree_node/classification_spec.rb b/spec/presenters/tree_node/classification_spec.rb index bd41a63a78d..cfbd4e33663 100644 --- a/spec/presenters/tree_node/classification_spec.rb +++ b/spec/presenters/tree_node/classification_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Classification do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/compliance_detail_spec.rb b/spec/presenters/tree_node/compliance_detail_spec.rb index e81c99efda0..d878756a6f4 100644 --- a/spec/presenters/tree_node/compliance_detail_spec.rb +++ b/spec/presenters/tree_node/compliance_detail_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ComplianceDetail do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:compliance_detail, :miq_policy_result => result) } diff --git a/spec/presenters/tree_node/compliance_spec.rb b/spec/presenters/tree_node/compliance_spec.rb index a1e98efd324..1e3651b0b53 100644 --- a/spec/presenters/tree_node/compliance_spec.rb +++ b/spec/presenters/tree_node/compliance_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Compliance do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:compliance, :compliant => compliant) } diff --git a/spec/presenters/tree_node/condition_spec.rb b/spec/presenters/tree_node/condition_spec.rb index e55335714cf..3752d09754f 100644 --- a/spec/presenters/tree_node/condition_spec.rb +++ b/spec/presenters/tree_node/condition_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Condition do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:condition) } diff --git a/spec/presenters/tree_node/configuration_profile_spec.rb b/spec/presenters/tree_node/configuration_profile_spec.rb index 8f24dd5cf18..9c39c11bb7c 100644 --- a/spec/presenters/tree_node/configuration_profile_spec.rb +++ b/spec/presenters/tree_node/configuration_profile_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ConfigurationProfile do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:configuration_profile_foreman) } diff --git a/spec/presenters/tree_node/configuration_script_base_spec.rb b/spec/presenters/tree_node/configuration_script_base_spec.rb index a330a655eb7..e4e4b0c2325 100644 --- a/spec/presenters/tree_node/configuration_script_base_spec.rb +++ b/spec/presenters/tree_node/configuration_script_base_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ConfigurationScriptBase do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:ansible_configuration_script) } diff --git a/spec/presenters/tree_node/configured_system_spec.rb b/spec/presenters/tree_node/configured_system_spec.rb index 88e97a19227..eb76d59bab6 100644 --- a/spec/presenters/tree_node/configured_system_spec.rb +++ b/spec/presenters/tree_node/configured_system_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ConfiguredSystem do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/container_spec.rb b/spec/presenters/tree_node/container_spec.rb index c10b58bb465..9cdc1a1e079 100644 --- a/spec/presenters/tree_node/container_spec.rb +++ b/spec/presenters/tree_node/container_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Container do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/custom_button_set_spec.rb b/spec/presenters/tree_node/custom_button_set_spec.rb index 8e4f7b4ff14..7ee5c9ce460 100644 --- a/spec/presenters/tree_node/custom_button_set_spec.rb +++ b/spec/presenters/tree_node/custom_button_set_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::CustomButtonSet do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:custom_button_set, :description => "custom button set description") } diff --git a/spec/presenters/tree_node/custom_button_spec.rb b/spec/presenters/tree_node/custom_button_spec.rb index 13f7949de95..b17fc1ee87e 100644 --- a/spec/presenters/tree_node/custom_button_spec.rb +++ b/spec/presenters/tree_node/custom_button_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::CustomButton do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:custom_button, :applies_to_class => 'Host') } diff --git a/spec/presenters/tree_node/customization_template_spec.rb b/spec/presenters/tree_node/customization_template_spec.rb index 3d20aedb071..712c66a08d0 100644 --- a/spec/presenters/tree_node/customization_template_spec.rb +++ b/spec/presenters/tree_node/customization_template_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::CustomizationTemplate do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/dialog_field_spec.rb b/spec/presenters/tree_node/dialog_field_spec.rb index 1c3d42be14e..0f62bc107d2 100644 --- a/spec/presenters/tree_node/dialog_field_spec.rb +++ b/spec/presenters/tree_node/dialog_field_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::DialogField do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:dialog_field) } diff --git a/spec/presenters/tree_node/dialog_group_spec.rb b/spec/presenters/tree_node/dialog_group_spec.rb index 9c79b29afb5..d0cda50d308 100644 --- a/spec/presenters/tree_node/dialog_group_spec.rb +++ b/spec/presenters/tree_node/dialog_group_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::DialogGroup do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:dialog_group) } diff --git a/spec/presenters/tree_node/dialog_spec.rb b/spec/presenters/tree_node/dialog_spec.rb index 1f893785b1d..7f1265fb1e4 100644 --- a/spec/presenters/tree_node/dialog_spec.rb +++ b/spec/presenters/tree_node/dialog_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Dialog do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:dialog) } diff --git a/spec/presenters/tree_node/dialog_tab_spec.rb b/spec/presenters/tree_node/dialog_tab_spec.rb index 82d1d5aca2a..1b15db239a6 100644 --- a/spec/presenters/tree_node/dialog_tab_spec.rb +++ b/spec/presenters/tree_node/dialog_tab_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::DialogTab do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:dialog_tab) } diff --git a/spec/presenters/tree_node/ems_cluster_spec.rb b/spec/presenters/tree_node/ems_cluster_spec.rb index c063b8f2107..59e0d30a175 100644 --- a/spec/presenters/tree_node/ems_cluster_spec.rb +++ b/spec/presenters/tree_node/ems_cluster_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::EmsCluster do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/ems_folder_spec.rb b/spec/presenters/tree_node/ems_folder_spec.rb index 68fa7072513..c60bec0f15e 100644 --- a/spec/presenters/tree_node/ems_folder_spec.rb +++ b/spec/presenters/tree_node/ems_folder_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::EmsFolder do subject { described_class.new(object, nil, options) } let(:options) { Hash.new } diff --git a/spec/presenters/tree_node/ext_management_system_spec.rb b/spec/presenters/tree_node/ext_management_system_spec.rb index b6209bdfd8a..72e7f683553 100644 --- a/spec/presenters/tree_node/ext_management_system_spec.rb +++ b/spec/presenters/tree_node/ext_management_system_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ExtManagementSystem do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/guest_device_spec.rb b/spec/presenters/tree_node/guest_device_spec.rb index 79ea24d0e63..943a73ad598 100644 --- a/spec/presenters/tree_node/guest_device_spec.rb +++ b/spec/presenters/tree_node/guest_device_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::GuestDevice do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:guest_device, :controller_type => 'foo') } diff --git a/spec/presenters/tree_node/host_spec.rb b/spec/presenters/tree_node/host_spec.rb index d803dbedde7..3fa4a981a3f 100644 --- a/spec/presenters/tree_node/host_spec.rb +++ b/spec/presenters/tree_node/host_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Host do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/iso_datastore_spec.rb b/spec/presenters/tree_node/iso_datastore_spec.rb index af9d0b573a4..06278a13819 100644 --- a/spec/presenters/tree_node/iso_datastore_spec.rb +++ b/spec/presenters/tree_node/iso_datastore_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::IsoDatastore do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:iso_datastore) } diff --git a/spec/presenters/tree_node/iso_image_spec.rb b/spec/presenters/tree_node/iso_image_spec.rb index eb00bc0ac2a..eb601d8a3b5 100644 --- a/spec/presenters/tree_node/iso_image_spec.rb +++ b/spec/presenters/tree_node/iso_image_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::IsoImage do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:iso_image) } diff --git a/spec/presenters/tree_node/lan_spec.rb b/spec/presenters/tree_node/lan_spec.rb index ecbbfac4187..f2be43a7ffe 100644 --- a/spec/presenters/tree_node/lan_spec.rb +++ b/spec/presenters/tree_node/lan_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Lan do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:lan) } diff --git a/spec/presenters/tree_node/ldap_domain_spec.rb b/spec/presenters/tree_node/ldap_domain_spec.rb index 5c98685fc7a..8c5dab2b229 100644 --- a/spec/presenters/tree_node/ldap_domain_spec.rb +++ b/spec/presenters/tree_node/ldap_domain_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::LdapDomain do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:ldap_domain) } diff --git a/spec/presenters/tree_node/ldap_region_spec.rb b/spec/presenters/tree_node/ldap_region_spec.rb index 58daebfcc47..5745a761ada 100644 --- a/spec/presenters/tree_node/ldap_region_spec.rb +++ b/spec/presenters/tree_node/ldap_region_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::LdapRegion do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:ldap_region) } diff --git a/spec/presenters/tree_node/miq_action_spec.rb b/spec/presenters/tree_node/miq_action_spec.rb index cdd9f3bcd3f..46a532a860c 100644 --- a/spec/presenters/tree_node/miq_action_spec.rb +++ b/spec/presenters/tree_node/miq_action_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAction do subject { described_class.new(object, nil, :tree => :action_tree) } let(:object) { FactoryGirl.create(:miq_action, :name => 'raise_automation_event', :action_type => 'default') } diff --git a/spec/presenters/tree_node/miq_ae_class_spec.rb b/spec/presenters/tree_node/miq_ae_class_spec.rb index a075520a241..fe1e4901d3a 100644 --- a/spec/presenters/tree_node/miq_ae_class_spec.rb +++ b/spec/presenters/tree_node/miq_ae_class_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAeClass do subject { described_class.new(object, nil, {}) } let(:object) do diff --git a/spec/presenters/tree_node/miq_ae_instance_spec.rb b/spec/presenters/tree_node/miq_ae_instance_spec.rb index 0d9ef7d2ccb..29b696bb202 100644 --- a/spec/presenters/tree_node/miq_ae_instance_spec.rb +++ b/spec/presenters/tree_node/miq_ae_instance_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAeInstance do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_ae_instance) } diff --git a/spec/presenters/tree_node/miq_ae_method_spec.rb b/spec/presenters/tree_node/miq_ae_method_spec.rb index e01f033ad77..5ad4f59a58f 100644 --- a/spec/presenters/tree_node/miq_ae_method_spec.rb +++ b/spec/presenters/tree_node/miq_ae_method_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAeMethod do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_ae_method, :scope => :class, :language => :ruby, :location => :inline) } diff --git a/spec/presenters/tree_node/miq_ae_namespace_spec.rb b/spec/presenters/tree_node/miq_ae_namespace_spec.rb index 8e180c82176..8c59132231a 100644 --- a/spec/presenters/tree_node/miq_ae_namespace_spec.rb +++ b/spec/presenters/tree_node/miq_ae_namespace_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAeNamespace do before { login_as FactoryGirl.create(:user_with_group) } subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/miq_alert_set_spec.rb b/spec/presenters/tree_node/miq_alert_set_spec.rb index 3e5440167ae..06b64c07c93 100644 --- a/spec/presenters/tree_node/miq_alert_set_spec.rb +++ b/spec/presenters/tree_node/miq_alert_set_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAlertSet do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_alert_set) } diff --git a/spec/presenters/tree_node/miq_alert_spec.rb b/spec/presenters/tree_node/miq_alert_spec.rb index 27a70d3af54..fa20433252f 100644 --- a/spec/presenters/tree_node/miq_alert_spec.rb +++ b/spec/presenters/tree_node/miq_alert_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqAlert do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_alert) } diff --git a/spec/presenters/tree_node/miq_dialog_spec.rb b/spec/presenters/tree_node/miq_dialog_spec.rb index 6558c2de245..7c14beb59da 100644 --- a/spec/presenters/tree_node/miq_dialog_spec.rb +++ b/spec/presenters/tree_node/miq_dialog_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqDialog do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_dialog) } diff --git a/spec/presenters/tree_node/miq_event_definition_spec.rb b/spec/presenters/tree_node/miq_event_definition_spec.rb index 04d27fdf7e0..488339509c0 100644 --- a/spec/presenters/tree_node/miq_event_definition_spec.rb +++ b/spec/presenters/tree_node/miq_event_definition_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqEventDefinition do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_event_definition) } diff --git a/spec/presenters/tree_node/miq_group_spec.rb b/spec/presenters/tree_node/miq_group_spec.rb index 7442c5092ac..cd551b72d65 100644 --- a/spec/presenters/tree_node/miq_group_spec.rb +++ b/spec/presenters/tree_node/miq_group_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqGroup do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_group) } diff --git a/spec/presenters/tree_node/miq_policy_set_spec.rb b/spec/presenters/tree_node/miq_policy_set_spec.rb index ab7749023f7..c6e2eb029da 100644 --- a/spec/presenters/tree_node/miq_policy_set_spec.rb +++ b/spec/presenters/tree_node/miq_policy_set_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqPolicySet do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_policy_set, :name => 'Just a set') } diff --git a/spec/presenters/tree_node/miq_policy_spec.rb b/spec/presenters/tree_node/miq_policy_spec.rb index 588b213c56c..abfe9753dd0 100644 --- a/spec/presenters/tree_node/miq_policy_spec.rb +++ b/spec/presenters/tree_node/miq_policy_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqPolicy do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_policy, :towhat => 'Vm', :active => true, :mode => 'control') } diff --git a/spec/presenters/tree_node/miq_region_spec.rb b/spec/presenters/tree_node/miq_region_spec.rb index 639d32d603e..3fe99a10f2b 100644 --- a/spec/presenters/tree_node/miq_region_spec.rb +++ b/spec/presenters/tree_node/miq_region_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqRegion do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_region, :description => 'Elbonia') } diff --git a/spec/presenters/tree_node/miq_report_result_spec.rb b/spec/presenters/tree_node/miq_report_result_spec.rb index 9decd22aede..560c284fe2a 100644 --- a/spec/presenters/tree_node/miq_report_result_spec.rb +++ b/spec/presenters/tree_node/miq_report_result_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqReportResult do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/miq_report_spec.rb b/spec/presenters/tree_node/miq_report_spec.rb index 28692588058..11aa4e7856d 100644 --- a/spec/presenters/tree_node/miq_report_spec.rb +++ b/spec/presenters/tree_node/miq_report_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqReport do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_report) } diff --git a/spec/presenters/tree_node/miq_schedule_spec.rb b/spec/presenters/tree_node/miq_schedule_spec.rb index cd7ea5e001a..7ccf43ddafb 100644 --- a/spec/presenters/tree_node/miq_schedule_spec.rb +++ b/spec/presenters/tree_node/miq_schedule_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqSchedule do subject { described_class.new(object, nil, {}) } let(:object) do diff --git a/spec/presenters/tree_node/miq_scsi_lun_spec.rb b/spec/presenters/tree_node/miq_scsi_lun_spec.rb index c25452f53a5..49f6c44d148 100644 --- a/spec/presenters/tree_node/miq_scsi_lun_spec.rb +++ b/spec/presenters/tree_node/miq_scsi_lun_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqScsiLun do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_scsi_lun, :canonical_name => 'foo') } diff --git a/spec/presenters/tree_node/miq_scsi_target_spec.rb b/spec/presenters/tree_node/miq_scsi_target_spec.rb index a605180b9ed..330aac887dc 100644 --- a/spec/presenters/tree_node/miq_scsi_target_spec.rb +++ b/spec/presenters/tree_node/miq_scsi_target_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqScsiTarget do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_scsi_target) } diff --git a/spec/presenters/tree_node/miq_search_spec.rb b/spec/presenters/tree_node/miq_search_spec.rb index 04e5e57f5e1..a13e0652426 100644 --- a/spec/presenters/tree_node/miq_search_spec.rb +++ b/spec/presenters/tree_node/miq_search_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqSearch do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_search) } diff --git a/spec/presenters/tree_node/miq_server_spec.rb b/spec/presenters/tree_node/miq_server_spec.rb index a03032af07c..3fd3f341056 100644 --- a/spec/presenters/tree_node/miq_server_spec.rb +++ b/spec/presenters/tree_node/miq_server_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqServer do subject { described_class.new(object, nil, {}) } let(:object) do diff --git a/spec/presenters/tree_node/miq_user_role_spec.rb b/spec/presenters/tree_node/miq_user_role_spec.rb index ade26527443..6e3ea250eea 100644 --- a/spec/presenters/tree_node/miq_user_role_spec.rb +++ b/spec/presenters/tree_node/miq_user_role_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqUserRole do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_user_role) } diff --git a/spec/presenters/tree_node/miq_widget_set_spec.rb b/spec/presenters/tree_node/miq_widget_set_spec.rb index 0cd56159b3d..6a496f3f2f9 100644 --- a/spec/presenters/tree_node/miq_widget_set_spec.rb +++ b/spec/presenters/tree_node/miq_widget_set_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqWidgetSet do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_widget_set, :name => 'foo') } diff --git a/spec/presenters/tree_node/miq_widget_spec.rb b/spec/presenters/tree_node/miq_widget_spec.rb index 36ff302e8bf..bfcaf349112 100644 --- a/spec/presenters/tree_node/miq_widget_spec.rb +++ b/spec/presenters/tree_node/miq_widget_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::MiqWidget do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:miq_widget) } diff --git a/spec/presenters/tree_node/orchestration_template_spec.rb b/spec/presenters/tree_node/orchestration_template_spec.rb index 299cef7af2c..aa454c6b18a 100644 --- a/spec/presenters/tree_node/orchestration_template_spec.rb +++ b/spec/presenters/tree_node/orchestration_template_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::OrchestrationTemplate do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/pxe_image_spec.rb b/spec/presenters/tree_node/pxe_image_spec.rb index 57d5c5d6256..4d89d1c295e 100644 --- a/spec/presenters/tree_node/pxe_image_spec.rb +++ b/spec/presenters/tree_node/pxe_image_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::PxeImage do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/pxe_image_type_spec.rb b/spec/presenters/tree_node/pxe_image_type_spec.rb index 15e3cf75161..c9f83c83b9a 100644 --- a/spec/presenters/tree_node/pxe_image_type_spec.rb +++ b/spec/presenters/tree_node/pxe_image_type_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::PxeImageType do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:pxe_image_type) } diff --git a/spec/presenters/tree_node/pxe_server_spec.rb b/spec/presenters/tree_node/pxe_server_spec.rb index 9dc65867988..6d2b9e6765e 100644 --- a/spec/presenters/tree_node/pxe_server_spec.rb +++ b/spec/presenters/tree_node/pxe_server_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::PxeServer do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:pxe_server) } diff --git a/spec/presenters/tree_node/resource_pool_spec.rb b/spec/presenters/tree_node/resource_pool_spec.rb index 0fe9fef3e18..800d6f657f7 100644 --- a/spec/presenters/tree_node/resource_pool_spec.rb +++ b/spec/presenters/tree_node/resource_pool_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ResourcePool do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:resource_pool) } diff --git a/spec/presenters/tree_node/scan_item_set_spec.rb b/spec/presenters/tree_node/scan_item_set_spec.rb index 7b96fc4f541..bf6048dc8c5 100644 --- a/spec/presenters/tree_node/scan_item_set_spec.rb +++ b/spec/presenters/tree_node/scan_item_set_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ScanItemSet do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:scan_item_set) } diff --git a/spec/presenters/tree_node/server_role_spec.rb b/spec/presenters/tree_node/server_role_spec.rb index ec0b63053e4..ed938e04663 100644 --- a/spec/presenters/tree_node/server_role_spec.rb +++ b/spec/presenters/tree_node/server_role_spec.rb @@ -1,6 +1,3 @@ -require 'shared/presenters/tree_node/server_roles' -require 'shared/presenters/tree_node/common' - describe TreeNode::ServerRole do include_context 'server roles' let(:object) { server_role } diff --git a/spec/presenters/tree_node/service_resource_spec.rb b/spec/presenters/tree_node/service_resource_spec.rb index 8a4064a0a7d..c4da349f24b 100644 --- a/spec/presenters/tree_node/service_resource_spec.rb +++ b/spec/presenters/tree_node/service_resource_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ServiceResource do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:service_resource) } diff --git a/spec/presenters/tree_node/service_spec.rb b/spec/presenters/tree_node/service_spec.rb index 45a45f766b0..cac9e4187a2 100644 --- a/spec/presenters/tree_node/service_spec.rb +++ b/spec/presenters/tree_node/service_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Service do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:service) } diff --git a/spec/presenters/tree_node/service_template_catalog_spec.rb b/spec/presenters/tree_node/service_template_catalog_spec.rb index e478a45e7d4..122969a1590 100644 --- a/spec/presenters/tree_node/service_template_catalog_spec.rb +++ b/spec/presenters/tree_node/service_template_catalog_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ServiceTemplateCatalog do subject { described_class.new(object, nil, {}) } let(:object) do diff --git a/spec/presenters/tree_node/service_template_spec.rb b/spec/presenters/tree_node/service_template_spec.rb index ad233c7a273..15f8961ba93 100644 --- a/spec/presenters/tree_node/service_template_spec.rb +++ b/spec/presenters/tree_node/service_template_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::ServiceTemplate do subject { described_class.new(object, nil, {}) } let(:tenant) { FactoryGirl.create(:tenant) } diff --git a/spec/presenters/tree_node/snapshot_spec.rb b/spec/presenters/tree_node/snapshot_spec.rb index be3a8d2df95..367d52a5f63 100644 --- a/spec/presenters/tree_node/snapshot_spec.rb +++ b/spec/presenters/tree_node/snapshot_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Snapshot do subject { described_class.new(object, nil, {}) } let(:object) do diff --git a/spec/presenters/tree_node/storage_spec.rb b/spec/presenters/tree_node/storage_spec.rb index be239dbb47e..e8d9eeab727 100644 --- a/spec/presenters/tree_node/storage_spec.rb +++ b/spec/presenters/tree_node/storage_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Storage do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:storage) } diff --git a/spec/presenters/tree_node/switch_spec.rb b/spec/presenters/tree_node/switch_spec.rb index eeb5e22d98c..50c6349864a 100644 --- a/spec/presenters/tree_node/switch_spec.rb +++ b/spec/presenters/tree_node/switch_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Switch do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:switch, :name => "light") } diff --git a/spec/presenters/tree_node/tenant_spec.rb b/spec/presenters/tree_node/tenant_spec.rb index db77d0bf481..843c625cbc0 100644 --- a/spec/presenters/tree_node/tenant_spec.rb +++ b/spec/presenters/tree_node/tenant_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Tenant do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:tenant) } diff --git a/spec/presenters/tree_node/user_spec.rb b/spec/presenters/tree_node/user_spec.rb index 301b721385f..5fc81f94f71 100644 --- a/spec/presenters/tree_node/user_spec.rb +++ b/spec/presenters/tree_node/user_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::User do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:user) } diff --git a/spec/presenters/tree_node/vm_or_template_spec.rb b/spec/presenters/tree_node/vm_or_template_spec.rb index b4aa2dcd6e0..09c1dc6171c 100644 --- a/spec/presenters/tree_node/vm_or_template_spec.rb +++ b/spec/presenters/tree_node/vm_or_template_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::VmOrTemplate do subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/vmdb_index_spec.rb b/spec/presenters/tree_node/vmdb_index_spec.rb index ee1ad47ec8d..a8c37932dd1 100644 --- a/spec/presenters/tree_node/vmdb_index_spec.rb +++ b/spec/presenters/tree_node/vmdb_index_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::VmdbIndex do let(:object) { FactoryGirl.create(:vmdb_index, :name => 'foo') } subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/vmdb_table_spec.rb b/spec/presenters/tree_node/vmdb_table_spec.rb index d3f18160846..0f795478eb9 100644 --- a/spec/presenters/tree_node/vmdb_table_spec.rb +++ b/spec/presenters/tree_node/vmdb_table_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::VmdbTable do let(:object) { FactoryGirl.create(:vmdb_table_evm, :name => 'foo') } subject { described_class.new(object, nil, {}) } diff --git a/spec/presenters/tree_node/windows_image_spec.rb b/spec/presenters/tree_node/windows_image_spec.rb index 9b7809d82d0..ebcf7028bbc 100644 --- a/spec/presenters/tree_node/windows_image_spec.rb +++ b/spec/presenters/tree_node/windows_image_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::WindowsImage do subject { described_class.new(object, nil, {}) } let(:object) { FactoryGirl.create(:windows_image) } diff --git a/spec/presenters/tree_node/zone_spec.rb b/spec/presenters/tree_node/zone_spec.rb index 99f3de7f1f7..14ce243def4 100644 --- a/spec/presenters/tree_node/zone_spec.rb +++ b/spec/presenters/tree_node/zone_spec.rb @@ -1,5 +1,3 @@ -require 'shared/presenters/tree_node/common' - describe TreeNode::Zone do let(:object) { FactoryGirl.create(:zone, :name => "foo") } subject { described_class.new(object, nil, {}) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 17b35e89c9e..293ba86b563 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -26,11 +26,10 @@ # require core_support_path.join('settings_helper.rb') # # Known: -# require core_support_path.join("examples_group/shared_examples_for_application_helper.rb") # require core_support_path.join("rake_task_example_group.rb") Dir[Rails.root.join('spec', 'shared', '**', '*.rb')].each { |f| require f } -Dir[ManageIQ::UI::Classic::Engine.root.join('spec/shared/controllers/**/*.rb')].each { |f| require f } +Dir[ManageIQ::UI::Classic::Engine.root.join('spec/shared/**/*.rb')].each { |f| require f } Dir[ManageIQ::Gems::Pending.root.join("spec/support/custom_matchers/*.rb")].each { |f| require f } RSpec.configure do |config|