From c7744f604bc8d176ee25a67d07dd60ffec338976 Mon Sep 17 00:00:00 2001 From: d-m-u Date: Wed, 16 Oct 2019 08:45:30 -0400 Subject: [PATCH] Save the updated widget timestamp --- app/models/miq_widget.rb | 4 +--- spec/models/miq_widget/report_content_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/miq_widget.rb b/app/models/miq_widget.rb index 3fc35c57009..e95996cd481 100644 --- a/app/models/miq_widget.rb +++ b/app/models/miq_widget.rb @@ -327,9 +327,7 @@ def find_or_build_contents_for_user(group, user, timezone = nil) settings_for_build[:user_id] = user.id if user settings_for_build[:timezone] = timezone if timezone contents = miq_widget_contents.find_by(settings_for_build) || miq_widget_contents.build(settings_for_build) - contents.updated_at = Time.now.utc # Force updated timestamp to change when saved even if the new contents are the same - - contents + contents.tap { |c| c.update!(:updated_at => Time.now.utc) } end # TODO: group/user support diff --git a/spec/models/miq_widget/report_content_spec.rb b/spec/models/miq_widget/report_content_spec.rb index 5348c6ea0f6..de79fd93efb 100644 --- a/spec/models/miq_widget/report_content_spec.rb +++ b/spec/models/miq_widget/report_content_spec.rb @@ -32,6 +32,7 @@ it "#generate_one_content_for_user" do content = widget.generate_one_content_for_user(@admin_group, @admin) expect(content).to be_kind_of MiqWidgetContent + expect(content.updated_at).to be_within(2.seconds).of(Time.now.utc) expect(content.contents.scan("").length).to eq(widget.options[:row_count] + 1) expect(content.contents.scan("").length).to eq(widget.options[:row_count] * widget.options[:col_order].length) expect(content.contents.scan("").length).to eq(widget.options[:col_order].length) @@ -44,6 +45,7 @@ it "#generate_one_content_for_group" do content = widget.generate_one_content_for_group(@admin.current_group, @admin.get_timezone) expect(content).to be_kind_of MiqWidgetContent + expect(content.updated_at).to be_within(2.seconds).of(Time.now.utc) expect(content.contents.scan("").length).to eq(widget.options[:row_count] + 1) expect(content.contents.scan("").length).to eq(widget.options[:row_count] * widget.options[:col_order].length) expect(content.contents.scan("").length).to eq(widget.options[:col_order].length)