From 5130b4d674085eb5edc64f11afd2d10ab43a65e7 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 8 Oct 2020 13:48:16 -0400 Subject: [PATCH] Ignore disabled out-of-date remote themes (#10870) No need to alert in admin dashboard about out of date remote themes that are disabled. --- app/models/remote_theme.rb | 1 + spec/models/remote_theme_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 292ba79d7eb..2ec39d6a01a 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -104,6 +104,7 @@ class RemoteTheme < ActiveRecord::Base def self.out_of_date_themes self.joined_remotes.where("commits_behind > 0 OR remote_version <> local_version") + .where(themes: { enabled: true }) .pluck("themes.name", "themes.id") end diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb index 8b0e44ea416..70ebaaea78f 100644 --- a/spec/models/remote_theme_spec.rb +++ b/spec/models/remote_theme_spec.rb @@ -245,6 +245,13 @@ describe RemoteTheme do remote.update!(local_version: "new version", commits_behind: 0) expect(described_class.out_of_date_themes).to eq([]) end + + it "ignores disabled out of date themes" do + remote.update!(local_version: "old version", remote_version: "new version", commits_behind: 2) + theme.update!(enabled: false) + expect(described_class.out_of_date_themes).to eq([]) + end + end context ".unreachable_themes" do