diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 11:42:01 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-10-28 23:36:36 -0700 |
commit | 932822f464bf8f5f57167e9dd0985079f1cd6551 (patch) | |
tree | 47cb817ad2bc97ff3d3eaed3d844187318891d52 | |
parent | ef037519673c5619319793fbe922849b3ca1369b (diff) | |
download | gitlab-ce-932822f464bf8f5f57167e9dd0985079f1cd6551.tar.gz |
Merge branch '23890-api-should-accepts-boolean' into 'master'
API: Fix booleans not recognized as such when using the `to_boolean` helper
Fixes #22831
Fixes #23890
See merge request !7149
-rw-r--r-- | lib/api/helpers.rb | 1 | ||||
-rw-r--r-- | spec/requests/api/api_helpers_spec.rb | 29 |
2 files changed, 19 insertions, 11 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 45120898b76..8025581d3ca 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -6,6 +6,7 @@ module API SUDO_PARAM = :sudo def to_boolean(value) + return value if [true, false].include?(value) return true if value =~ /^(true|t|yes|y|1|on)$/i return false if value =~ /^(false|f|no|n|0|off)$/i diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb index 0f41f8dc7f1..f7fe4c10873 100644 --- a/spec/requests/api/api_helpers_spec.rb +++ b/spec/requests/api/api_helpers_spec.rb @@ -266,18 +266,25 @@ describe API::Helpers, api: true do end describe '.to_boolean' do + it 'accepts booleans' do + expect(to_boolean(true)).to be(true) + expect(to_boolean(false)).to be(false) + end + it 'converts a valid string to a boolean' do - expect(to_boolean('true')).to be_truthy - expect(to_boolean('YeS')).to be_truthy - expect(to_boolean('t')).to be_truthy - expect(to_boolean('1')).to be_truthy - expect(to_boolean('ON')).to be_truthy - expect(to_boolean('FaLse')).to be_falsy - expect(to_boolean('F')).to be_falsy - expect(to_boolean('NO')).to be_falsy - expect(to_boolean('n')).to be_falsy - expect(to_boolean('0')).to be_falsy - expect(to_boolean('oFF')).to be_falsy + expect(to_boolean(true)).to be(true) + expect(to_boolean('true')).to be(true) + expect(to_boolean('YeS')).to be(true) + expect(to_boolean('t')).to be(true) + expect(to_boolean('1')).to be(true) + expect(to_boolean('ON')).to be(true) + + expect(to_boolean('FaLse')).to be(false) + expect(to_boolean('F')).to be(false) + expect(to_boolean('NO')).to be(false) + expect(to_boolean('n')).to be(false) + expect(to_boolean('0')).to be(false) + expect(to_boolean('oFF')).to be(false) end it 'converts an invalid string to nil' do |