diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
| commit | 00b00f1edee71d236b0cd5b796bb68f15142911f (patch) | |
| tree | 471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /spec/models/environment_spec.rb | |
| parent | f4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff) | |
| parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
| download | gitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz | |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'spec/models/environment_spec.rb')
| -rw-r--r-- | spec/models/environment_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index b6162908e12..fe69c8e351d 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -247,7 +247,10 @@ describe Environment, models: true do context 'when user is allowed to stop environment' do before do - project.add_master(user) + project.add_developer(user) + + create(:protected_branch, :developers_can_merge, + name: 'master', project: project) end context 'when action did not yet finish' do |