summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-07-05 06:32:05 +0000
committerRémy Coutable <remy@rymai.me>2018-07-05 06:32:05 +0000
commit3db2f327594e134729a0ca2f48a748bb28ab7d6c (patch)
tree661033b988897aaf506c0deaf457c2002e17d51b /spec/features/merge_requests
parentbaab4cddb091c0aa9649fecc340b8b343747ba83 (diff)
downloadgitlab-ce-3db2f327594e134729a0ca2f48a748bb28ab7d6c.tar.gz
Enable Capybara/FeatureMethods cop
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/user_squashes_merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
index 6c952791591..da3d6772eeb 100644
--- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb
+++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-feature 'User squashes a merge request', :js do
+describe 'User squashes a merge request', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }
let(:source_branch) { 'csv' }