9 files changed, 117 insertions, 4 deletions

diff --git a/spec/features/profiles/user_visits_profile_account_page_spec.rb b/spec/features/profiles/user_visits_profile_account_page_spec.rb
new file mode 100644
index 00000000000..8c7233c77ad
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_account_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile account page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_account_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Account')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb b/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb
new file mode 100644
index 00000000000..ffb504cc573
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the authentication log page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(audit_log_profile_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Authentication log')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_page_spec.rb b/spec/features/profiles/user_visits_profile_page_spec.rb
new file mode 100644
index 00000000000..3bf6d718bc7
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Profile')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index c935cdfd5c4..d1776b3d7c2 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -1,14 +1,20 @@
 require 'spec_helper'
 
-describe 'Profile > Preferences', :js do
+describe 'User visits the profile preferences page' do
   let(:user) { create(:user) }
 
   before do
     sign_in(user)
-    visit profile_preferences_path
+
+    visit(profile_preferences_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Preferences')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
   end
 
-  describe 'User changes their syntax highlighting theme' do
+  describe 'User changes their syntax highlighting theme', :js do
     it 'creates a flash message' do
       choose 'user_color_scheme_id_5'
 
@@ -27,7 +33,7 @@ describe 'Profile > Preferences', :js do
     end
   end
 
-  describe 'User changes their default dashboard' do
+  describe 'User changes their default dashboard', :js do
     it 'creates a flash message' do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
diff --git a/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
new file mode 100644
index 00000000000..0b7a63b54b4
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile SSH keys page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_keys_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('SSH Keys')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb
index 80d58ff6bf7..5e272af6073 100644
--- a/spec/helpers/auto_devops_helper_spec.rb
+++ b/spec/helpers/auto_devops_helper_spec.rb
@@ -65,5 +65,21 @@ describe AutoDevopsHelper do
 
       it { is_expected.to eq(false) }
     end
+
+    context 'when master contains a .gitlab-ci.yml file' do
+      before do
+        allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']")
+      end
+
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when another service is enabled' do
+      before do
+        create(:service, project: project, category: :ci, active: true)
+      end
+
+      it { is_expected.to eq(false) }
+    end
   end
 end
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 1437479831e..a76c75e0c08 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -469,4 +469,15 @@ describe ProjectsHelper do
       expect(recorder.count).to eq(1)
     end
   end
+
+  describe '#git_user_name' do
+    let(:user) { double(:user, name: 'John "A" Doe53') }
+    before do
+      allow(helper).to receive(:current_user).and_return(user)
+    end
+
+    it 'parses quotes in name' do
+      expect(helper.send(:git_user_name)).to eq('John \"A\" Doe53')
+    end
+  end
 end
diff --git a/spec/lib/banzai/pipeline/email_pipeline_spec.rb b/spec/lib/banzai/pipeline/email_pipeline_spec.rb
new file mode 100644
index 00000000000..6a11ca2f9d5
--- /dev/null
+++ b/spec/lib/banzai/pipeline/email_pipeline_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+describe Banzai::Pipeline::EmailPipeline do
+  describe '.filters' do
+    it 'returns the expected type' do
+      expect(described_class.filters).to be_kind_of(Banzai::FilterArray)
+    end
+
+    it 'excludes ImageLazyLoadFilter' do
+      expect(described_class.filters).not_to be_empty
+      expect(described_class.filters).not_to include(Banzai::Filter::ImageLazyLoadFilter)
+    end
+  end
+end
diff --git a/spec/services/ci/pipeline_trigger_service_spec.rb b/spec/services/ci/pipeline_trigger_service_spec.rb
index 9a6875e448c..f4ff818c479 100644
--- a/spec/services/ci/pipeline_trigger_service_spec.rb
+++ b/spec/services/ci/pipeline_trigger_service_spec.rb
@@ -34,6 +34,8 @@ describe Ci::PipelineTriggerService do
           expect(result[:pipeline].ref).to eq('master')
           expect(result[:pipeline].project).to eq(project)
           expect(result[:pipeline].user).to eq(trigger.owner)
+          expect(result[:pipeline].trigger_requests.to_a)
+            .to eq(result[:pipeline].builds.map(&:trigger_request).uniq)
           expect(result[:status]).to eq(:success)
         end