Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'

CE Backport of EE changes

See merge request gitlab-org/gitlab-ce!32203

3 files changed, 23 insertions, 1 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index d25cb5afc9c..2c11df1f15a 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -160,6 +160,10 @@ module QA
     module Group
       autoload :New, 'qa/page/group/new'
       autoload :Show, 'qa/page/group/show'
+
+      module Settings
+        autoload :General, 'qa/page/group/settings/general'
+      end
     end
 
     module File
diff --git a/qa/qa/page/group/settings/general.rb b/qa/qa/page/group/settings/general.rb
new file mode 100644
index 00000000000..07b421f154a
--- /dev/null
+++ b/qa/qa/page/group/settings/general.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Group
+      module Settings
+        class General < QA::Page::Base
+          view 'app/views/groups/edit.html.haml' do
+            element :permission_lfs_2fa_section
+          end
+          view 'app/views/groups/settings/_permissions.html.haml' do
+            element :save_permissions_changes_button
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb
index e2b1c4c0831..6eff0e87ddc 100644
--- a/qa/qa/resource/sandbox.rb
+++ b/qa/qa/resource/sandbox.rb
@@ -7,7 +7,7 @@ module QA
     # creating it if it doesn't yet exist.
     #
     class Sandbox < Base
-      attr_reader :path
+      attr_accessor :path
 
       attribute :id