Add latest changes from gitlab-org/gitlab@master

3 files changed, 27 insertions, 30 deletions

diff --git a/spec/requests/api/pages/internal_access_spec.rb b/spec/requests/api/pages/internal_access_spec.rb
index 821a210a414..91139b987df 100644
--- a/spec/requests/api/pages/internal_access_spec.rb
+++ b/spec/requests/api/pages/internal_access_spec.rb
@@ -6,16 +6,15 @@ describe "Internal Project Pages Access" do
   using RSpec::Parameterized::TableSyntax
   include AccessMatchers
 
-  set(:group) { create(:group) }
-  set(:project) { create(:project, :internal, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
-
-  set(:admin) { create(:admin) }
-  set(:owner) { create(:user) }
-  set(:master) { create(:user) }
-  set(:developer) { create(:user) }
-  set(:reporter) { create(:user) }
-  set(:guest) { create(:user) }
-  set(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project, reload: true) { create(:project, :internal, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:master) { create(:user) }
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
+  let_it_be(:guest) { create(:user) }
+  let_it_be(:user) { create(:user) }
 
   before do
     allow(Gitlab.config.pages).to receive(:access_control).and_return(true)
diff --git a/spec/requests/api/pages/private_access_spec.rb b/spec/requests/api/pages/private_access_spec.rb
index ec84762b05a..7c592ccfd43 100644
--- a/spec/requests/api/pages/private_access_spec.rb
+++ b/spec/requests/api/pages/private_access_spec.rb
@@ -6,16 +6,15 @@ describe "Private Project Pages Access" do
   using RSpec::Parameterized::TableSyntax
   include AccessMatchers
 
-  set(:group) { create(:group) }
-  set(:project) { create(:project, :private, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
-
-  set(:admin) { create(:admin) }
-  set(:owner) { create(:user) }
-  set(:master) { create(:user) }
-  set(:developer) { create(:user) }
-  set(:reporter) { create(:user) }
-  set(:guest) { create(:user) }
-  set(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project, reload: true) { create(:project, :private, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:master) { create(:user) }
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
+  let_it_be(:guest) { create(:user) }
+  let_it_be(:user) { create(:user) }
 
   before do
     allow(Gitlab.config.pages).to receive(:access_control).and_return(true)
diff --git a/spec/requests/api/pages/public_access_spec.rb b/spec/requests/api/pages/public_access_spec.rb
index 67b8cfb8fbc..f2fe64434c6 100644
--- a/spec/requests/api/pages/public_access_spec.rb
+++ b/spec/requests/api/pages/public_access_spec.rb
@@ -6,16 +6,15 @@ describe "Public Project Pages Access" do
   using RSpec::Parameterized::TableSyntax
   include AccessMatchers
 
-  set(:group) { create(:group) }
-  set(:project) { create(:project, :public, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
-
-  set(:admin) { create(:admin) }
-  set(:owner) { create(:user) }
-  set(:master) { create(:user) }
-  set(:developer) { create(:user) }
-  set(:reporter) { create(:user) }
-  set(:guest) { create(:user) }
-  set(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project, reload: true) { create(:project, :public, pages_access_level: ProjectFeature::ENABLED, namespace: group) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:master) { create(:user) }
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
+  let_it_be(:guest) { create(:user) }
+  let_it_be(:user) { create(:user) }
 
   before do
     allow(Gitlab.config.pages).to receive(:access_control).and_return(true)