diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-13 11:04:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-13 11:04:33 +0000 |
| commit | d1df36e3864967f65f662c1367d3bdfe993beadd (patch) | |
| tree | 09cdc737f73baa94ae9b1e47100e9f8aa96ec4a5 /spec/requests/api | |
| parent | f49868adf1a2ea24815d432640cd0d996e0d87a0 (diff) | |
| parent | 90e11fb272cd30e7e61be16d862830f2b69a624a (diff) | |
| download | gitlab-ce-d1df36e3864967f65f662c1367d3bdfe993beadd.tar.gz | |
Merge branch 'refactor/global-permissions-for-internal-users' into 'master'
Refactor/global permissions for internal users
See merge request !9598
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/helpers_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/helpers_spec.rb b/spec/requests/api/helpers_spec.rb index a89676fec93..988a57a80ea 100644 --- a/spec/requests/api/helpers_spec.rb +++ b/spec/requests/api/helpers_spec.rb @@ -436,7 +436,7 @@ describe API::Helpers, api: true do context 'current_user is present' do before do - expect_any_instance_of(self.class).to receive(:current_user).and_return(true) + expect_any_instance_of(self.class).to receive(:current_user).at_least(:once).and_return(User.new) end it 'does not raise an error' do |