Add latest changes from gitlab-org/gitlab@master

7 files changed, 55 insertions, 1 deletions

diff --git a/spec/views/layouts/application.html.haml_spec.rb b/spec/views/layouts/application.html.haml_spec.rb
index 0f359219718..30c27078ad8 100644
--- a/spec/views/layouts/application.html.haml_spec.rb
+++ b/spec/views/layouts/application.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'layouts/application' do
+RSpec.describe 'layouts/application', :themed_layout do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/views/layouts/devise.html.haml_spec.rb b/spec/views/layouts/devise.html.haml_spec.rb
new file mode 100644
index 00000000000..e69cf93cfb4
--- /dev/null
+++ b/spec/views/layouts/devise.html.haml_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/devise' do
+  it_behaves_like 'a layout which reflects the application theme setting'
+end
diff --git a/spec/views/layouts/devise_empty.html.haml_spec.rb b/spec/views/layouts/devise_empty.html.haml_spec.rb
new file mode 100644
index 00000000000..06d742e74dd
--- /dev/null
+++ b/spec/views/layouts/devise_empty.html.haml_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/devise_empty' do
+  it_behaves_like 'a layout which reflects the application theme setting'
+end
diff --git a/spec/views/layouts/fullscreen.html.haml_spec.rb b/spec/views/layouts/fullscreen.html.haml_spec.rb
new file mode 100644
index 00000000000..0ae2c76ebcb
--- /dev/null
+++ b/spec/views/layouts/fullscreen.html.haml_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/fullscreen' do
+  let_it_be(:user) { create(:user) }
+
+  before do
+    allow(view).to receive(:current_user_mode).and_return(Gitlab::Auth::CurrentUserMode.new(user))
+  end
+
+  it_behaves_like 'a layout which reflects the application theme setting'
+end
diff --git a/spec/views/layouts/signup_onboarding.html.haml_spec.rb b/spec/views/layouts/signup_onboarding.html.haml_spec.rb
new file mode 100644
index 00000000000..8748c673616
--- /dev/null
+++ b/spec/views/layouts/signup_onboarding.html.haml_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/signup_onboarding' do
+  it_behaves_like 'a layout which reflects the application theme setting'
+end
diff --git a/spec/views/layouts/simple_registration.html.haml_spec.rb b/spec/views/layouts/simple_registration.html.haml_spec.rb
new file mode 100644
index 00000000000..98553a12ad8
--- /dev/null
+++ b/spec/views/layouts/simple_registration.html.haml_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/simple_registration' do
+  it_behaves_like 'a layout which reflects the application theme setting'
+end
diff --git a/spec/views/layouts/terms.html.haml_spec.rb b/spec/views/layouts/terms.html.haml_spec.rb
new file mode 100644
index 00000000000..520882449c5
--- /dev/null
+++ b/spec/views/layouts/terms.html.haml_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'layouts/terms' do
+  let_it_be(:user) { create(:user) }
+
+  before do
+    allow(view).to receive(:current_user_mode).and_return(Gitlab::Auth::CurrentUserMode.new(user))
+  end
+
+  it_behaves_like 'a layout which reflects the application theme setting'
+end