spec/ee/spec/lib/ee/gitlab/ldap/user_spec.rb

@@ -100,6 +100,14 @@
       it "sets the user's external flag to false" do
         expect(gl_user.external).to be_falsey
       end
+
+      context 'when the user_default_external application setting is true' do
+        it 'does not set the external flag to false' do
+          stub_application_setting(user_default_external: true)
+
+          expect(gl_user.external).to be_truthy
+        end
+      end
     end
   end
 end

spec/ee/spec/lib/gitlab/geo_spec.rb

@@ -18,24 +18,57 @@
     end
   end
 
-  describe 'fdw?' do
+  describe 'fdw_capable?' do
     let(:fdw_check) { "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = 'gitlab_secondary' AND table_type = 'FOREIGN TABLE'" }
 
     before do
-      allow(::Geo::BaseRegistry.connection).to receive(:execute).with(anything).and_call_original
+      allow(::Geo::TrackingBase.connection).to receive(:execute).with(anything).and_call_original
     end
 
     it 'returns true when PostgreSQL FDW is enabled' do
-      expect(::Geo::BaseRegistry.connection).to receive(:execute).with(fdw_check).and_return([{ 'count' => 1 }])
+      expect(::Geo::TrackingBase.connection).to receive(:execute).with(fdw_check).and_return([{ 'count' => 1 }])
+
+      expect(described_class.fdw_capable?).to be_truthy
+    end
+
+    it 'returns false when PostgreSQL FDW is not enabled' do
+      expect(::Geo::TrackingBase.connection).to receive(:execute).with(fdw_check).and_return([{ 'count' => 0 }])
 
-      expect(described_class.fdw?).to be_truthy
+      expect(described_class.fdw_capable?).to be_falsey
     end
+  end
 
+  describe 'fdw?' do
     it 'returns false when PostgreSQL FDW is not enabled' do
-      expect(::Geo::BaseRegistry.connection).to receive(:execute).with(fdw_check).and_return([{ 'count' => 0 }])
+      allow(::Geo::TrackingBase.connection).to receive(:execute).and_return([{ 'count' => 0 }])
+      allow(Rails.configuration).to receive(:geo_database).and_return('fdw' => true)
 
       expect(described_class.fdw?).to be_falsey
     end
+
+    context 'with fdw capable' do
+      before do
+        allow(described_class).to receive(:fdw_capable?).and_return(true)
+      end
+
+      it 'returns true by default' do
+        allow(Rails.configuration).to receive(:geo_database).and_return('fdw' => nil)
+
+        expect(described_class.fdw?).to be_truthy
+      end
+
+      it 'returns false if configured in `config/database_geo.yml`' do
+        allow(Rails.configuration).to receive(:geo_database).and_return('fdw' => false)
+
+        expect(described_class.fdw?).to be_falsey
+      end
+
+      it 'returns true if configured in `config/database_geo.yml`' do
+        allow(Rails.configuration).to receive(:geo_database).and_return('fdw' => true)
+
+        expect(described_class.fdw?).to be_truthy
+      end
+    end
   end
 
   describe 'primary?' do

spec/ee/spec/models/geo_node_spec.rb

@@ -78,6 +78,17 @@
     end
   end
 
+  describe '#repair' do
+    it 'creates an oauth application for a Geo secondary node' do
+      stub_current_geo_node(node)
+      node.update_attribute(:oauth_application, nil)
+
+      node.repair
+
+      expect(node.oauth_application).to be_present
+    end
+  end
+
   describe '#current?' do
     it 'returns true when node is the current node' do
       node = described_class.new(url: described_class.current_node_url)

spec/ee/spec/services/boards/create_service_spec.rb

 require 'spec_helper'
 
 describe Boards::CreateService, services: true do
+  shared_examples 'board with milestone predefined scope' do
+    let(:project) { create(:project) }
+
+    it 'creates board with correct milestone' do
+      stub_licensed_features(scoped_issue_board: true)
+
+      board = described_class
+        .new(project, double, milestone_id: milestone_class.id)
+        .execute
+
+      expect(board.reload.milestone).to eq(milestone_class)
+    end
+  end
+
   shared_examples 'boards create service' do
     context 'With the feature available' do
       before do
@@ -71,5 +85,77 @@
     it_behaves_like 'boards create service' do
       let(:parent) { create(:group) }
     end
+
+    it_behaves_like 'board with milestone predefined scope' do
+      let(:milestone_class) { ::Milestone::Upcoming }
+    end
+
+    it_behaves_like 'board with milestone predefined scope' do
+      let(:milestone_class) { ::Milestone::Started }
+    end
+
+    context 'group board milestone' do
+      let(:group) { create(:group) }
+      let!(:milestone) { create(:milestone) }
+
+      before do
+        stub_licensed_features(scoped_issue_board: true)
+      end
+
+      it 'is not persisted if it is not within group milestones' do
+        service = described_class.new(group, double, milestone_id: milestone.id)
+
+        group_board = service.execute
+
+        expect(group_board.milestone).to be_nil
+      end
+
+      it 'is persisted if it is within group milestones' do
+        milestone.update!(project: nil, group: group)
+        service = described_class.new(group, double, milestone_id: milestone.id)
+
+        group_board = service.execute
+
+        expect(group_board.reload.milestone).to eq(milestone)
+      end
+    end
+
+    context 'project board milestone' do
+      let(:project) { create(:project, :private) }
+      let!(:milestone) { create(:milestone) }
+
+      before do
+        stub_licensed_features(scoped_issue_board: true)
+      end
+
+      it 'is not persisted if it is not within project milestones' do
+        service = described_class.new(project, double, milestone_id: milestone.id)
+
+        board = service.execute
+
+        expect(board.reload.milestone).to be_nil
+      end
+
+      it 'is persisted if it is within project milestones' do
+        milestone.update!(project: project)
+        service = described_class.new(project, double, milestone_id: milestone.id)
+
+        board = service.execute
+
+        expect(board.reload.milestone).to eq(milestone)
+      end
+
+      it 'is persisted if it is within project group milestones' do
+        project_group = create(:group)
+        project.update(group: project_group)
+        milestone.update!(project: nil, group: project_group)
+
+        service = described_class.new(project_group, double, milestone_id: milestone.id)
+
+        board = service.execute
+
+        expect(board.reload.milestone).to eq(milestone)
+      end
+    end
   end
 end

spec/ee/spec/services/boards/update_service_spec.rb

 require 'spec_helper'
 
 describe Boards::UpdateService, services: true do
+  shared_examples 'board with milestone predefined scope' do
+    let(:project) { create(:project) }
+    let!(:board)  { create(:board) }
+
+    it 'updates board to milestone id' do
+      stub_licensed_features(scoped_issue_board: true)
+
+      described_class
+        .new(project, double, milestone_id: milestone_class.id)
+        .execute(board)
+
+      expect(board.reload.milestone).to eq(milestone_class)
+    end
+  end
+
   describe '#execute' do
+    let(:project) { create(:project) }
     let(:group) { create(:group) }
     let!(:board)  { create(:board, group: group, name: 'Backend') }
 
@@ -24,5 +40,106 @@
 
       expect(service.execute(board)).to eq false
     end
+
+    it 'updates the configuration params when scoped issue board is enabled' do
+      stub_licensed_features(scoped_issue_board: true)
+      assignee = create(:user)
+      milestone = create(:milestone, project: project)
+      label = create(:label, project: project)
+
+      service = described_class.new(project, double,
+                                    milestone_id: milestone.id,
+                                    assignee_id: assignee.id,
+                                    label_ids: [label.id])
+      service.execute(board)
+
+      expect(board.reload).to have_attributes(milestone: milestone,
+                                              assignee: assignee,
+                                              labels: [label])
+    end
+
+    it 'filters unpermitted params when scoped issue board is not enabled' do
+      stub_licensed_features(scoped_issue_board: false)
+      params = { milestone_id: double, assignee_id: double, label_ids: double, weight: double }
+
+      service = described_class.new(project, double, params)
+      service.execute(board)
+
+      expect(board.reload).to have_attributes(milestone: nil,
+                                              assignee: nil,
+                                              labels: [])
+    end
+
+    it_behaves_like 'board with milestone predefined scope' do
+      let(:milestone_class) { ::Milestone::Upcoming }
+    end
+
+    it_behaves_like 'board with milestone predefined scope' do
+      let(:milestone_class) { ::Milestone::Started }
+    end
+
+    context 'group board milestone' do
+      let(:group) { create(:group) }
+      let(:group_board) { create(:board, group: group, name: 'Backend Group') }
+      let!(:milestone) { create(:milestone) }
+
+      before do
+        stub_licensed_features(scoped_issue_board: true)
+      end
+
+      it 'is not updated if it is not within group milestones' do
+        service = described_class.new(group, double, milestone_id: milestone.id)
+
+        service.execute(group_board)
+
+        expect(group_board.reload.milestone).to be_nil
+      end
+
+      it 'is updated if it is within group milestones' do
+        milestone.update!(project: nil, group: group)
+        service = described_class.new(group, double, milestone_id: milestone.id)
+
+        service.execute(group_board)
+
+        expect(group_board.reload.milestone).to eq(milestone)
+      end
+    end
+
+    context 'project board milestone' do
+      let!(:milestone) { create(:milestone) }
+
+      before do
+        stub_licensed_features(scoped_issue_board: true)
+      end
+
+      it 'is not updated if it is not within project milestones' do
+        service = described_class.new(project, double, milestone_id: milestone.id)
+
+        service.execute(board)
+
+        expect(board.reload.milestone).to be_nil
+      end
+
+      it 'is updated if it is within project milestones' do
+        milestone.update!(project: project)
+        service = described_class.new(project, double, milestone_id: milestone.id)
+
+        service.execute(board)
+
+        expect(board.reload.milestone).to eq(milestone)
+      end
+
+      it 'is updated if it is within project group milestones' do
+        project_group = create(:group)
+        project.update(group: project_group)
+        milestone.update!(project: nil, group: project_group)
+
+        service = described_class.new(project_group, double, milestone_id: milestone.id)
+
+        service.execute(board)
+
+        expect(board.reload.milestone).to eq(milestone)
+      end
+    end
   end
 end

spec/factories/deploy_keys_projects.rb

@@ -2,5 +2,9 @@
   factory :deploy_keys_project do
     deploy_key
     project
+
+    trait :write_access do
+      can_push true
+    end
   end
 end

spec/factories/geo_node_statuses.rb

 FactoryBot.define do
   factory :geo_node_status do
-    sequence(:id)
     geo_node
     storage_shards { StorageShard.all }
 

spec/factories/keys.rb

@@ -15,10 +15,6 @@
       factory :another_deploy_key, class: 'DeployKey'
     end
 
-    factory :write_access_key, class: 'DeployKey' do
-      can_push true
-    end
-
     factory :rsa_key_2048 do
       key do
         <<~KEY.delete("\n")

spec/features/admin/admin_builds_spec.rb

@@ -21,7 +21,7 @@
           expect(page).to have_selector('.nav-links li.active', text: 'All')
           expect(page).to have_selector('.row-content-block', text: 'All jobs')
           expect(page.all('.build-link').size).to eq(4)
-          expect(page).to have_link 'Cancel all'
+          expect(page).to have_button 'Stop all jobs'
         end
       end
 
@@ -31,7 +31,7 @@
 
           expect(page).to have_selector('.nav-links li.active', text: 'All')
           expect(page).to have_content 'No jobs to show'
-          expect(page).not_to have_link 'Cancel all'
+          expect(page).not_to have_button 'Stop all jobs'
         end
       end
     end
@@ -51,7 +51,7 @@
           expect(page.find('.build-link')).not_to have_content(build2.id)
           expect(page.find('.build-link')).not_to have_content(build3.id)
           expect(page.find('.build-link')).not_to have_content(build4.id)
-          expect(page).to have_link 'Cancel all'
+          expect(page).to have_button 'Stop all jobs'
         end
       end
 
@@ -63,7 +63,7 @@
 
           expect(page).to have_selector('.nav-links li.active', text: 'Pending')
           expect(page).to have_content 'No jobs to show'
-          expect(page).not_to have_link 'Cancel all'
+          expect(page).not_to have_button 'Stop all jobs'
         end
       end
     end
@@ -83,7 +83,7 @@
           expect(page.find('.build-link')).not_to have_content(build2.id)
           expect(page.find('.build-link')).not_to have_content(build3.id)
           expect(page.find('.build-link')).not_to have_content(build4.id)
-          expect(page).to have_link 'Cancel all'
+          expect(page).to have_button 'Stop all jobs'
         end
       end
 
@@ -95,7 +95,7 @@
 
           expect(page).to have_selector('.nav-links li.active', text: 'Running')
           expect(page).to have_content 'No jobs to show'
-          expect(page).not_to have_link 'Cancel all'
+          expect(page).not_to have_button 'Stop all jobs'
         end
       end
     end
@@ -113,7 +113,7 @@
           expect(page.find('.build-link')).not_to have_content(build1.id)
           expect(page.find('.build-link')).not_to have_content(build2.id)
           expect(page.find('.build-link')).to have_content(build3.id)
-          expect(page).to have_link 'Cancel all'
+          expect(page).to have_button 'Stop all jobs'
         end
       end
 
@@ -125,7 +125,7 @@
 
           expect(page).to have_selector('.nav-links li.active', text: 'Finished')
           expect(page).to have_content 'No jobs to show'
-          expect(page).to have_link 'Cancel all'
+          expect(page).to have_button 'Stop all jobs'
         end
       end
     end

spec/features/admin/admin_deploy_keys_spec.rb

@@ -17,6 +17,16 @@
     end
   end
 
+  it 'shows all the projects the deploy key has write access' do
+    write_key = create(:deploy_keys_project, :write_access, deploy_key: deploy_key)
+
+    visit admin_deploy_keys_path
+
+    page.within(find('.deploy-keys-list', match: :first)) do
+      expect(page).to have_content(write_key.project.full_name)
+    end
+  end
+
   describe 'create a new deploy key' do
     let(:new_ssh_key) { attributes_for(:key)[:key] }
 
@@ -28,14 +38,12 @@
     it 'creates a new deploy key' do
       fill_in 'deploy_key_title', with: 'laptop'
       fill_in 'deploy_key_key', with: new_ssh_key
-      check 'deploy_key_can_push'
       click_button 'Create'
 
       expect(current_path).to eq admin_deploy_keys_path
 
       page.within(find('.deploy-keys-list', match: :first)) do
         expect(page).to have_content('laptop')
-        expect(page).to have_content('Yes')
       end
     end
   end
@@ -48,14 +56,12 @@
 
     it 'updates an existing deploy key' do
       fill_in 'deploy_key_title', with: 'new-title'
-      check 'deploy_key_can_push'
       click_button 'Save changes'
 
       expect(current_path).to eq admin_deploy_keys_path
 
       page.within(find('.deploy-keys-list', match: :first)) do
         expect(page).to have_content('new-title')
-        expect(page).to have_content('Yes')
       end
     end
   end

spec/features/admin/admin_hooks_spec.rb

 require 'spec_helper'
 
-describe 'Admin::Hooks', :js do
-  before do
-    @project = create(:project)
-    sign_in(create(:admin))
+describe 'Admin::Hooks' do
+  let(:user) { create(:admin) }
 
-    @system_hook = create(:system_hook)
+  before do
+    sign_in(user)
   end
 
   describe 'GET /admin/hooks' do
@@ -13,15 +12,17 @@
       visit admin_root_path
 
       page.within '.nav-sidebar' do
-        click_on 'Hooks'
+        click_on 'System Hooks', match: :first
       end
 
       expect(current_path).to eq(admin_hooks_path)
     end
 
     it 'has hooks list' do
+      system_hook = create(:system_hook)
+
       visit admin_hooks_path
-      expect(page).to have_content(@system_hook.url)
+      expect(page).to have_content(system_hook.url)
     end
   end
 
@@ -43,6 +44,10 @@
   describe 'Update existing hook' do
     let(:new_url) { generate(:url) }
 
+    before do
+      create(:system_hook)
+    end
+
     it 'updates existing hook' do
       visit admin_hooks_path
 
@@ -57,7 +62,11 @@
     end
   end
 
-  describe 'Remove existing hook' do
+  describe 'Remove existing hook', :js do
+    before do
+      create(:system_hook)
+    end
+
     context 'removes existing hook' do
       it 'from hooks list page' do
         visit admin_hooks_path
@@ -76,7 +85,8 @@
 
   describe 'Test', :js do
     before do
-      WebMock.stub_request(:post, @system_hook.url)
+      system_hook = create(:system_hook)
+      WebMock.stub_request(:post, system_hook.url)
       visit admin_hooks_path
 
       find('.hook-test-button.dropdown').click
@@ -85,4 +95,41 @@
 
     it { expect(current_path).to eq(admin_hooks_path) }
   end
+
+  context 'Merge request hook' do
+    describe 'New Hook' do
+      let(:url) { generate(:url) }
+
+      it 'adds new hook' do
+        visit admin_hooks_path
+
+        fill_in 'hook_url', with: url
+        uncheck 'Repository update events'
+        check 'Merge request events'
+
+        expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
+        expect(current_path).to eq(admin_hooks_path)
+        expect(page).to have_content(url)
+      end
+    end
+
+    describe 'Test', :js do
+      before do
+        system_hook = create(:system_hook)
+        WebMock.stub_request(:post, system_hook.url)
+      end
+
+      it 'succeeds if the user has a repository with a merge request' do
+        project = create(:project, :repository)
+        create(:project_member, user: user, project: project)
+        create(:merge_request, source_project: project)
+
+        visit admin_hooks_path
+        find('.hook-test-button.dropdown').click
+        click_link 'Merge requests events'
+
+        expect(page).to have_content 'Hook executed successfully'
+      end
+    end
+  end
 end

spec/features/boards/boards_spec.rb

@@ -71,6 +71,7 @@
     let!(:backlog)    { create(:label, project: project, name: 'Backlog') }
     let!(:closed)       { create(:label, project: project, name: 'Closed') }
     let!(:accepting)  { create(:label, project: project, name: 'Accepting Merge Requests') }
+    let!(:a_plus) { create(:label, project: project, name: 'A+') }
 
     let!(:list1) { create(:list, board: board, label: planning, position: 0) }
     let!(:list2) { create(:list, board: board, label: development, position: 1) }
@@ -85,6 +86,7 @@
     let!(:issue7) { create(:labeled_issue, project: project, title: 'ggg', description: '777', labels: [development], relative_position: 2) }
     let!(:issue8) { create(:closed_issue, project: project, title: 'hhh', description: '888') }
     let!(:issue9) { create(:labeled_issue, project: project, title: 'iii', description: '999', labels: [planning, testing, bug, accepting], relative_position: 1) }
+    let!(:issue10) { create(:labeled_issue, project: project, title: 'issue +', description: 'A+ great issue', labels: [a_plus]) }
 
     before do
       visit project_boards_path(project)
@@ -402,6 +404,15 @@
         wait_for_empty_boards((3..4))
       end
 
+      it 'filters by label with encoded character' do
+        set_filter("label", a_plus.title)
+        click_filter_link(a_plus.title)
+        submit_filter
+
+        wait_for_board_cards(1, 1)
+        wait_for_empty_boards((2..4))
+      end
+
       it 'filters by label with space after reload' do
         set_filter("label", "\"#{accepting.title}")
         click_filter_link(accepting.title)

spec/features/cycle_analytics_spec.rb

@@ -113,6 +113,7 @@
 
   context "as a guest" do
     before do
+      project.add_developer(user)
       project.add_guest(guest)
 
       allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])

spec/features/issues/issue_sidebar_spec.rb

@@ -8,6 +8,7 @@
   let(:issue) { create(:issue, project: project) }
   let!(:user) { create(:user)}
   let!(:label) { create(:label, project: project, title: 'bug') }
+  let!(:xss_label) { create(:label, project: project, title: '<script>alert("xss");</script>') }
 
   before do
     sign_in(user)
@@ -99,6 +100,14 @@
         restore_window_size
         open_issue_sidebar
       end
+
+      it 'escapes XSS when viewing issue labels' do
+        page.within('.block.labels') do
+          find('.edit-link').click
+
+          expect(page).to have_content '<script>alert("xss");</script>'
+        end
+      end
     end
 
     context 'editing issue labels', :js do

spec/features/oauth_login_spec.rb

@@ -10,8 +10,7 @@ def enter_code(code)
 
   def stub_omniauth_config(provider)
     OmniAuth.config.add_mock(provider, OmniAuth::AuthHash.new(provider: provider.to_s, uid: "12345"))
-    set_devise_mapping(context: Rails.application)
-    Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[provider]
+    stub_omniauth_provider(provider)
   end
 
   providers = [:github, :twitter, :bitbucket, :gitlab, :google_oauth2,

spec/features/projects/import_export/import_file_spec.rb

@@ -32,7 +32,7 @@
 
         expect(page).to have_content('Import an exported GitLab project')
         expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=#{project_path}")
-        expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\h*\z/).and_call_original
+        expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}\z/).and_call_original
 
         attach_file('file', file)
         click_on 'Import project'

spec/features/projects/settings/repository_settings_spec.rb

@@ -43,7 +43,7 @@
 
         fill_in 'deploy_key_title', with: 'new_deploy_key'
         fill_in 'deploy_key_key', with: new_ssh_key
-        check 'deploy_key_can_push'
+        check 'deploy_key_deploy_keys_projects_attributes_0_can_push'
         click_button 'Add key'
 
         expect(page).to have_content('new_deploy_key')
@@ -57,7 +57,7 @@
         find('li', text: private_deploy_key.title).click_link('Edit')
 
         fill_in 'deploy_key_title', with: 'updated_deploy_key'
-        check 'deploy_key_can_push'
+        check 'deploy_key_deploy_keys_projects_attributes_0_can_push'
         click_button 'Save changes'
 
         expect(page).to have_content('updated_deploy_key')
@@ -74,11 +74,9 @@
         find('li', text: private_deploy_key.title).click_link('Edit')
 
         fill_in 'deploy_key_title', with: 'updated_deploy_key'
-        check 'deploy_key_can_push'
         click_button 'Save changes'
 
         expect(page).to have_content('updated_deploy_key')
-        expect(page).to have_content('Write access allowed')
       end
 
       scenario 'remove an existing deploy key' do

spec/features/user_can_display_performance_bar_spec.rb

 require 'rails_helper'
 
 describe 'User can display performance bar', :js do
-  shared_examples 'performance bar is disabled' do
+  shared_examples 'performance bar cannot be displayed' do
     it 'does not show the performance bar by default' do
       expect(page).not_to have_css('#peek')
     end
@@ -17,7 +17,7 @@
     end
   end
 
-  shared_examples 'performance bar is enabled' do
+  shared_examples 'performance bar can be displayed' do
     it 'does not show the performance bar by default' do
       expect(page).not_to have_css('#peek')
     end
@@ -33,6 +33,18 @@
     end
   end
 
+  shared_examples 'performance bar is enabled by default in development' do
+    before do
+      allow(Rails.env).to receive(:development?).and_return(true)
+    end
+
+    it 'shows the performance bar by default' do
+      refresh # Because we're stubbing Rails.env after the 1st visit to root_path
+
+      expect(page).to have_css('#peek')
+    end
+  end
+
   let(:group) { create(:group) }
 
   context 'when user is logged-out' do
@@ -45,7 +57,7 @@
         stub_application_setting(performance_bar_allowed_group_id: nil)
       end
 
-      it_behaves_like 'performance bar is disabled'
+      it_behaves_like 'performance bar cannot be displayed'
     end
 
     context 'when the performance_bar feature is enabled' do
@@ -53,7 +65,7 @@
         stub_application_setting(performance_bar_allowed_group_id: group.id)
       end
 
-      it_behaves_like 'performance bar is disabled'
+      it_behaves_like 'performance bar cannot be displayed'
     end
   end
 
@@ -72,7 +84,8 @@
         stub_application_setting(performance_bar_allowed_group_id: nil)
       end
 
-      it_behaves_like 'performance bar is disabled'
+      it_behaves_like 'performance bar cannot be displayed'
+      it_behaves_like 'performance bar is enabled by default in development'
     end
 
     context 'when the performance_bar feature is enabled' do
@@ -80,7 +93,8 @@
         stub_application_setting(performance_bar_allowed_group_id: group.id)
       end
 
-      it_behaves_like 'performance bar is enabled'
+      it_behaves_like 'performance bar is enabled by default in development'
+      it_behaves_like 'performance bar can be displayed'
     end
   end
 end

spec/finders/milestones_finder_spec.rb

@@ -21,10 +21,19 @@
     expect(result).to contain_exactly(milestone_1, milestone_2)
   end
 
-  it 'returns milestones for groups and projects' do
-    result = described_class.new(project_ids: [project_1.id, project_2.id], group_ids: group.id, state: 'all').execute
+  context 'milestones for groups and project' do
+    let(:result) do
+      described_class.new(project_ids: [project_1.id, project_2.id], group_ids: group.id, state: 'all').execute
+    end
+
+    it 'returns milestones for groups and projects' do
+      expect(result).to contain_exactly(milestone_1, milestone_2, milestone_3, milestone_4)
+    end
 
-    expect(result).to contain_exactly(milestone_1, milestone_2, milestone_3, milestone_4)
+    it 'orders milestones by due date' do
+      expect(result.first).to eq(milestone_1)
+      expect(result.second).to eq(milestone_3)
+    end
   end
 
   context 'with filters' do
@@ -61,30 +70,4 @@
       expect(result.to_a).to contain_exactly(milestone_1)
     end
   end
-
-  context 'with order' do
-    let(:params) do
-      {
-        project_ids: [project_1.id, project_2.id],
-        group_ids: group.id,
-        state: 'all'
-      }
-    end
-
-    it "default orders by due date" do
-      result = described_class.new(params).execute
-
-      expect(result.first).to eq(milestone_1)
-      expect(result.second).to eq(milestone_3)
-    end
-
-    it "orders by parameter" do
-      result = described_class.new(params.merge(order: 'id DESC')).execute
-
-      expect(result.first).to eq(milestone_4)
-      expect(result.second).to eq(milestone_3)
-      expect(result.third).to eq(milestone_2)
-      expect(result.fourth).to eq(milestone_1)
-    end
-  end
 end

spec/helpers/blob_helper_spec.rb

@@ -22,6 +22,13 @@ def test(input):
       expect(result).to eq(%[<pre class="code highlight"><code><span id="LC1" class="line" lang="">:type "assem"))</span></code></pre>])
     end
 
+    it 'returns plaintext for long blobs' do
+      stub_const('Blob::MAXIMUM_TEXT_HIGHLIGHT_SIZE', 1)
+      result = helper.highlight(blob_name, blob_content)
+
+      expect(result).to eq(%[<pre class="code highlight"><code><span id="LC1" class="line" lang="">(make-pathname :defaults name</span>\n<span id="LC2" class="line" lang="">:type "assem"))</span></code></pre>])
+    end
+
     it 'highlights single block' do
       expected = %Q[<pre class="code highlight"><code><span id="LC1" class="line" lang="common_lisp"><span class="p">(</span><span class="nb">make-pathname</span> <span class="ss">:defaults</span> <span class="nv">name</span></span>
 <span id="LC2" class="line" lang="common_lisp"><span class="ss">:type</span> <span class="s">"assem"</span><span class="p">))</span></span></code></pre>]