summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-06-04 23:32:22 +0000
committerNick Thomas <nick@gitlab.com>2018-06-04 23:32:22 +0000
commitbb2a847c8381dba03ac261c64e0022bf4823f912 (patch)
treeae6773d9d14f03999350db86a505f4b93170679d
parent0e9cd58050e8370a43c552a2382c7b5e05473488 (diff)
parentfb71c46805e14419897912f6338f635a21d1d097 (diff)
downloadgitlab-ce-bb2a847c8381dba03ac261c64e0022bf4823f912.tar.gz
Merge branch 'rails5-fix-application-setting-spec' into 'master'
Write repository_storages without type casting Closes #46238 See merge request gitlab-org/gitlab-ce!19367
-rw-r--r--spec/models/application_setting_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 968267a6d24..3e6656e0f12 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -110,10 +110,9 @@ describe ApplicationSetting do
# Upgraded databases will have this sort of content
context 'repository_storages is a String, not an Array' do
before do
- setting.__send__(:raw_write_attribute, :repository_storages, 'default')
+ described_class.where(id: setting.id).update_all(repository_storages: 'default')
end
- it { expect(setting.repository_storages_before_type_cast).to eq('default') }
it { expect(setting.repository_storages).to eq(['default']) }
end