diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-04-15 12:14:23 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-04-15 12:14:23 +0000 |
| commit | ffb6995f654eb2de63c7a295221f4fe4e2650877 (patch) | |
| tree | f21370cf9a7f8a1ce0d2911e972cd5913a1b9e3b | |
| parent | 5c0b509316a3c1bede3417b5e7b5ff981f02e0dd (diff) | |
| parent | 163aa71e8737f27dcb19eea48a97c1d3d4bb5566 (diff) | |
| download | gitlab-ce-ffb6995f654eb2de63c7a295221f4fe4e2650877.tar.gz | |
Merge branch 'ce-issue_6538' into 'master'
CE: Extract EE specific files/lines for spec/features/issues
See merge request gitlab-org/gitlab-ce!26740
| -rw-r--r-- | spec/features/issues/form_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/issues/user_uses_quick_actions_spec.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb index 6fa2ad8711f..597af566f9c 100644 --- a/spec/features/issues/form_spec.rb +++ b/spec/features/issues/form_spec.rb @@ -13,6 +13,8 @@ describe 'New/edit issue', :js do let!(:issue) { create(:issue, project: project, assignees: [user], milestone: milestone) } before do + stub_licensed_features(multiple_issue_assignees: false, issue_weights: false) + project.add_maintainer(user) project.add_maintainer(user2) sign_in(user) diff --git a/spec/features/issues/user_uses_quick_actions_spec.rb b/spec/features/issues/user_uses_quick_actions_spec.rb index 68af8303c2f..a9157ccaaa3 100644 --- a/spec/features/issues/user_uses_quick_actions_spec.rb +++ b/spec/features/issues/user_uses_quick_actions_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Issues > User uses quick actions', :js do |