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.

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

Normalize screaming case html yaml for zeitwerk #22489

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/authentication.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Authentication < ApplicationRecord
acts_as_miq_taggable
include_concern 'ImportExport'
include YAMLImportExportMixin
include YamlImportExportMixin
include SupportsFeatureMixin
include NewWithTypeStiMixin
def self.new(*args, &block)
Expand Down
2 changes: 1 addition & 1 deletion app/models/file_depot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class FileDepot < ApplicationRecord
include NewWithTypeStiMixin
include AuthenticationMixin
include_concern 'ImportExport'
include YAMLImportExportMixin
include YamlImportExportMixin

has_many :miq_schedules, :dependent => :nullify
has_many :miq_servers, :dependent => :nullify, :foreign_key => :log_file_depot_id
Expand Down
2 changes: 1 addition & 1 deletion app/models/generic_object_definition.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class GenericObjectDefinition < ApplicationRecord
include YAMLImportExportMixin
include YamlImportExportMixin
include_concern 'ImportExport'

TYPE_MAP = {
Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def self.policy_modes
include_concern 'ImportExport'

include UuidMixin
include YAMLImportExportMixin
include YamlImportExportMixin
before_validation :default_name_to_guid, :on => :create

default_value_for :towhat, 'Vm'
Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class MiqReport < ApplicationRecord
include_concern 'Notification'
include_concern 'Schedule'
include_concern 'Search'
include YAMLImportExportMixin
include YamlImportExportMixin

serialize :cols
serialize :conditions
Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_schedule.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class MiqSchedule < ApplicationRecord
include_concern 'ImportExport'
include_concern 'Filters'

include YAMLImportExportMixin
include YamlImportExportMixin
deprecate_attribute :towhat, :resource_type

validates :name, :uniqueness_when_changed => {:scope => [:userid, :resource_type]}
Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_search.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class MiqSearch < ApplicationRecord
serialize :options
serialize :filter
include_concern 'ImportExport'
include YAMLImportExportMixin
include YamlImportExportMixin

validates :name, :uniqueness_when_changed => {:scope => "db"}

Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_widget.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MiqWidget < ApplicationRecord

include_concern 'ImportExport'
include UuidMixin
include YAMLImportExportMixin
include YamlImportExportMixin
acts_as_miq_set_member

WIDGET_REPORT_SOURCE = "Generated for widget".freeze
Expand Down
2 changes: 1 addition & 1 deletion app/models/mixins/yaml_import_export_mixin.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module YAMLImportExportMixin
module YamlImportExportMixin
extend ActiveSupport::Concern

module ClassMethods
Expand Down
2 changes: 1 addition & 1 deletion lib/manageiq/reporting/formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module ReportFormatter
deprecate_constant 'C3Charting', 'ManageIQ::Reporting::Formatter::C3Charting'
deprecate_constant 'ChartCommon', 'ManageIQ::Reporting::Formatter::ChartCommon'
deprecate_constant 'Converter', 'ManageIQ::Reporting::Formatter::Converter'
deprecate_constant 'ReportHTML', 'ManageIQ::Reporting::Formatter::HTML'
deprecate_constant 'ReportHTML', 'ManageIQ::Reporting::Formatter::Html'
deprecate_constant 'ReportRenderer', 'ManageIQ::Reporting::Formatter::ReportRenderer'
deprecate_constant 'ReportText', 'ManageIQ::Reporting::Formatter::Text'
deprecate_constant 'ReportTimeline', 'ManageIQ::Reporting::Formatter::Timeline'
Expand Down
2 changes: 1 addition & 1 deletion lib/manageiq/reporting/formatter/html.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ManageIQ
module Reporting
module Formatter
class HTML < Ruport::Formatter
class Html < Ruport::Formatter
renders :html, :for => ManageIQ::Reporting::Formatter::ReportRenderer

def build_html_title
Expand Down
4 changes: 2 additions & 2 deletions spec/models/mixins/yaml_import_export_mixin_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RSpec.describe YAMLImportExportMixin do
let(:test_class) { Class.new { include YAMLImportExportMixin } }
RSpec.describe YamlImportExportMixin do
let(:test_class) { Class.new { include YamlImportExportMixin } }

before do
@report1 = FactoryBot.create(:miq_report, :name => "test_report_1")
Expand Down