diff options
| author | Robert Schilling <2900-razer6@users.noreply.gitlab.com> | 2019-01-15 22:05:39 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-15 22:05:39 +0300 |
| commit | 7be192803c3bb454ce9a265cd12a084a72be262b (patch) | |
| tree | 062413e89d7712e57ef388a3094c2a03d752eaaa /spec/requests/api | |
| parent | f06a9035137df34313c38fb4b5f7faf4bc783049 (diff) | |
API: Fix default branch protection setting for Admin API
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/settings_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb index cfbda63bb30..45fb1562e84 100644 --- a/spec/requests/api/settings_spec.rb +++ b/spec/requests/api/settings_spec.rb @@ -63,7 +63,8 @@ describe API::Settings, 'Settings' do terms: 'Hello world!', performance_bar_allowed_group_path: group.full_path, instance_statistics_visibility_private: true, - diff_max_patch_bytes: 150_000 + diff_max_patch_bytes: 150_000, + default_branch_protection: Gitlab::Access::PROTECTION_DEV_CAN_MERGE } expect(response).to have_gitlab_http_status(200) @@ -88,6 +89,7 @@ describe API::Settings, 'Settings' do expect(json_response['performance_bar_allowed_group_id']).to eq(group.id) expect(json_response['instance_statistics_visibility_private']).to be(true) expect(json_response['diff_max_patch_bytes']).to eq(150_000) + expect(json_response['default_branch_protection']).to eq(Gitlab::Access::PROTECTION_DEV_CAN_MERGE) end end |