Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8

This reverts merge request !14148

2 files changed, 58 insertions, 2 deletions

diff --git a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
index b155c20d8d3..cb52d971047 100644
--- a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
+++ b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
@@ -215,9 +215,17 @@ end
 # to a specific version of the database where said table is still present.
 #
 describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migration, schema: 20170825154015 do
+  let(:user_class) do
+    Class.new(ActiveRecord::Base) do
+      self.table_name = 'users'
+    end
+  end
+
   let(:migration) { described_class.new }
-  let(:project) { create(:project_empty_repo) }
-  let(:author) { create(:user) }
+  let(:user_class) { table(:users) }
+  let(:author) { build(:user).becomes(user_class).tap(&:save!).becomes(User) }
+  let(:namespace) { create(:namespace, owner: author) }
+  let(:project) { create(:project_empty_repo, namespace: namespace, creator: author) }
 
   # We can not rely on FactoryGirl as the state of Event may change in ways that
   # the background migration does not expect, hence we use the Event class of
diff --git a/spec/lib/gitlab/themes_spec.rb b/spec/lib/gitlab/themes_spec.rb
new file mode 100644
index 00000000000..ecacea6bb35
--- /dev/null
+++ b/spec/lib/gitlab/themes_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::Themes, lib: true do
+  describe '.body_classes' do
+    it 'returns a space-separated list of class names' do
+      css = described_class.body_classes
+
+      expect(css).to include('ui_indigo')
+      expect(css).to include(' ui_dark ')
+      expect(css).to include(' ui_blue')
+    end
+  end
+
+  describe '.by_id' do
+    it 'returns a Theme by its ID' do
+      expect(described_class.by_id(1).name).to eq 'Indigo'
+      expect(described_class.by_id(3).name).to eq 'Light'
+    end
+  end
+
+  describe '.default' do
+    it 'returns the default application theme' do
+      allow(described_class).to receive(:default_id).and_return(2)
+      expect(described_class.default.id).to eq 2
+    end
+
+    it 'prevents an infinite loop when configuration default is invalid' do
+      default = described_class::APPLICATION_DEFAULT
+      themes  = described_class::THEMES
+
+      config = double(default_theme: 0).as_null_object
+      allow(Gitlab).to receive(:config).and_return(config)
+      expect(described_class.default.id).to eq default
+
+      config = double(default_theme: themes.size + 5).as_null_object
+      allow(Gitlab).to receive(:config).and_return(config)
+      expect(described_class.default.id).to eq default
+    end
+  end
+
+  describe '.each' do
+    it 'passes the block to the THEMES Array' do
+      ids = []
+      described_class.each { |theme| ids << theme.id }
+      expect(ids).not_to be_empty
+    end
+  end
+end