summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-09-10 14:01:20 -0700
committerStan Hu <stanhu@gmail.com>2018-09-10 14:03:21 -0700
commit183c94dd638ab4306948733b68eccf35a6372dd1 (patch)
tree994e9e74615fea0bec8cabd8a73e8ba70473b419
parent3bf1cd5780fc6f08eac8046c8a6b475b8f7f30b7 (diff)
downloadgitlab-ce-183c94dd638ab4306948733b68eccf35a6372dd1.tar.gz
Work around migration specs failing due to repository storages not being selected
Migration specs may be missing a column necessary to create an ApplicationSetting object, which causes the FakeApplicationSetting to be initialized. However, the project selects a random repository storage via ApplicationSetting#pick_repository_storage, which isn't present in the OpenStruct. To workaround this issues, we add a pick_repository_storage method in FakeApplicationSetting.
-rw-r--r--lib/gitlab/fake_application_settings.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/fake_application_settings.rb b/lib/gitlab/fake_application_settings.rb
index bb14a8cd9e7..753160cc562 100644
--- a/lib/gitlab/fake_application_settings.rb
+++ b/lib/gitlab/fake_application_settings.rb
@@ -11,6 +11,10 @@ module Gitlab
FakeApplicationSettings.define_predicate_methods(options)
end
+ def pick_repository_storage
+ repository_storages.sample
+ end
+
# Mimic ActiveRecord predicate methods for boolean values
def self.define_predicate_methods(options)
options.each do |key, value|