From 3db2f327594e134729a0ca2f48a748bb28ab7d6c Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 5 Jul 2018 06:32:05 +0000
Subject: Enable Capybara/FeatureMethods cop

---
 spec/features/groups/share_lock_spec.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'spec/features/groups/share_lock_spec.rb')

diff --git a/spec/features/groups/share_lock_spec.rb b/spec/features/groups/share_lock_spec.rb
index cefbc15e068..5bbe77019ca 100644
--- a/spec/features/groups/share_lock_spec.rb
+++ b/spec/features/groups/share_lock_spec.rb
@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-feature 'Group share with group lock' do
-  given(:root_owner) { create(:user) }
-  given(:root_group) { create(:group) }
+describe 'Group share with group lock' do
+  let(:root_owner) { create(:user) }
+  let(:root_group) { create(:group) }
 
-  background do
+  before do
     root_group.add_owner(root_owner)
     sign_in(root_owner)
   end
 
   context 'with a subgroup', :nested_groups do
-    given!(:subgroup) { create(:group, parent: root_group) }
+    let!(:subgroup) { create(:group, parent: root_group) }
 
     context 'when enabling the parent group share with group lock' do
-      scenario 'the subgroup share with group lock becomes enabled' do
+      it 'the subgroup share with group lock becomes enabled' do
         visit edit_group_path(root_group)
 
         enable_group_lock
@@ -23,14 +23,14 @@ feature 'Group share with group lock' do
     end
 
     context 'when disabling the parent group share with group lock (which was already enabled)' do
-      background do
+      before do
         visit edit_group_path(root_group)
 
         enable_group_lock
       end
 
       context 'and the subgroup share with group lock is enabled' do
-        scenario 'the subgroup share with group lock does not change' do
+        it 'the subgroup share with group lock does not change' do
           visit edit_group_path(root_group)
 
           disable_group_lock
@@ -40,13 +40,13 @@ feature 'Group share with group lock' do
       end
 
       context 'but the subgroup share with group lock is disabled' do
-        background do
+        before do
           visit edit_group_path(subgroup)
 
           disable_group_lock
         end
 
-        scenario 'the subgroup share with group lock does not change' do
+        it 'the subgroup share with group lock does not change' do
           visit edit_group_path(root_group)
 
           disable_group_lock
-- 
cgit v1.2.3