Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 10 deletions

diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index fcb9293d4a9..64f90e44bb6 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -55,7 +55,7 @@ describe Projects::Environments::PrometheusApiController do
           end
 
           it 'replaces variables with values' do
-            get :proxy, params: environment_params.merge(query: 'up{environment="%{ci_environment_slug}"}')
+            get :proxy, params: environment_params.merge(query: 'up{environment="{{ci_environment_slug}}"}')
 
             expect(Prometheus::ProxyService).to have_received(:new)
               .with(environment, 'GET', 'query', expected_params)
diff --git a/spec/controllers/projects/static_site_editor_controller_spec.rb b/spec/controllers/projects/static_site_editor_controller_spec.rb
index f5d93122f59..7b470254de1 100644
--- a/spec/controllers/projects/static_site_editor_controller_spec.rb
+++ b/spec/controllers/projects/static_site_editor_controller_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 describe Projects::StaticSiteEditorController do
-  let(:project) { create(:project, :public, :repository) }
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:user) { create(:user) }
 
   describe 'GET show' do
     let(:default_params) do
@@ -27,8 +28,6 @@ describe Projects::StaticSiteEditorController do
       end
 
       context 'as guest' do
-        let(:user) { create(:user) }
-
         before do
           project.add_guest(user)
           sign_in(user)
@@ -42,10 +41,11 @@ describe Projects::StaticSiteEditorController do
 
       %w[developer maintainer].each do |role|
         context "as #{role}" do
-          let(:user) { create(:user) }
+          before_all do
+            project.add_role(user, role)
+          end
 
           before do
-            project.add_role(user, role)
             sign_in(user)
             get :show, params: default_params
           end
@@ -54,11 +54,8 @@ describe Projects::StaticSiteEditorController do
             expect(response).to render_template(:show)
           end
 
-          it 'assigns a config variable' do
+          it 'assigns a required variables' do
             expect(assigns(:config)).to be_a(Gitlab::StaticSiteEditor::Config)
-          end
-
-          it 'correctly assigns ref and path' do
             expect(assigns(:ref)).to eq('master')
             expect(assigns(:path)).to eq('README.md')
           end