diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2017-04-21 23:32:02 +0300 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-04-21 23:32:02 +0300 |
| commit | ff76adb5476f663fe92cec0ec4a78e93c7615191 (patch) | |
| tree | 7d850174c9abeaf2d2c34e099cca6194570a55a6 /spec/features/merge_requests/conflicts_spec.rb | |
| parent | d58350166d267d9923d39e783600fcd95eb4cd64 (diff) | |
Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 18508a44184..43977ad2fc5 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' feature 'Merge request conflict resolution', js: true, feature: true do - include WaitForAjax - let(:user) { create(:user) } let(:project) { create(:project) } |