diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 18:08:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 18:08:45 +0300 |
commit | 874c603d7a21724885ed24f15f457146aa1497c2 (patch) | |
tree | 9b562f45f9e79cd0bbba8e94e69511f620a1c3ed /spec/models | |
parent | 8eef083ccd59505b606e9733d38589cbd3d01fdf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/issue_spec.rb | 23 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 63f3e467143..291cccd72db 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -95,6 +95,29 @@ describe Issue do end end + describe 'locking' do + using RSpec::Parameterized::TableSyntax + + where(:lock_version) do + [ + [0], + ["0"] + ] + end + + with_them do + it 'works when an issue has a NULL lock_version' do + issue = create(:issue) + + described_class.where(id: issue.id).update_all('lock_version = NULL') + + issue.update!(lock_version: lock_version, title: 'locking test') + + expect(issue.reload.title).to eq('locking test') + end + end + end + describe '.simple_sorts' do it 'includes all keys' do expect(described_class.simple_sorts.keys).to include( diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index dc2d760dbeb..c70ddac5da6 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -55,6 +55,29 @@ describe MergeRequest do end end + describe 'locking' do + using RSpec::Parameterized::TableSyntax + + where(:lock_version) do + [ + [0], + ["0"] + ] + end + + with_them do + it 'works when a merge request has a NULL lock_version' do + merge_request = create(:merge_request) + + described_class.where(id: merge_request.id).update_all('lock_version = NULL') + + merge_request.update!(lock_version: lock_version, title: 'locking test') + + expect(merge_request.reload.title).to eq('locking test') + end + end + end + describe '#squash_in_progress?' do let(:repo_path) do Gitlab::GitalyClient::StorageSettings.allow_disk_access do |