Additional fix to handle NULL lock_version

If the UI sends a string value for lock_version (e.g. "0"), then the
previous monkey patch did not properly handle that properly. This
commit casts the value to an integer to determine whether to look for
NULL lock_versions.

For merge requests, GitLab sends a POST request to
`namespace/project/merge_requests/:iid` with the
`merge_request[lock_version]` parameter with a string `0`. The string
value comes from the form field, which explains why
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't
sufficient.

2 files changed, 32 insertions, 10 deletions

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 0ce4add5669..cc777cbf749 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -56,14 +56,25 @@ describe Issue do
   end
 
   describe 'locking' do
-    it 'works when an issue has a NULL lock_version' do
-      issue = create(:issue)
+    using RSpec::Parameterized::TableSyntax
 
-      described_class.where(id: issue.id).update_all('lock_version = NULL')
+    where(:lock_version) do
+      [
+        [0],
+        ["0"]
+      ]
+    end
 
-      issue.update!(lock_version: 0, title: 'locking test')
+    with_them do
+      it 'works when an issue has a NULL lock_version' do
+        issue = create(:issue)
 
-      expect(issue.reload.title).to eq('locking test')
+        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
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index ec2aef6f815..c72b6e9033d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -32,14 +32,25 @@ describe MergeRequest do
   end
 
   describe 'locking' do
-    it 'works when a merge request has a NULL lock_version' do
-      merge_request = create(:merge_request)
+    using RSpec::Parameterized::TableSyntax
 
-      described_class.where(id: merge_request.id).update_all('lock_version = NULL')
+    where(:lock_version) do
+      [
+        [0],
+        ["0"]
+      ]
+    end
 
-      merge_request.update!(lock_version: 0, title: 'locking test')
+    with_them do
+      it 'works when a merge request has a NULL lock_version' do
+        merge_request = create(:merge_request)
 
-      expect(merge_request.reload.title).to eq('locking test')
+        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