Merge branch 'master' into droplab-templating-xss-fix

spec/controllers/projects/environments_controller_spec.rb

 require 'spec_helper'
 describe Projects::EnvironmentsController do
-  include ApiHelpers
-
   let(:user) { create(:user) }
   let(:project) { create(:empty_project) }

spec/controllers/projects/merge_requests_controller_spec.rb

 require 'spec_helper'
 describe Projects::MergeRequestsController do
-  include ApiHelpers
-
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
   let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }

spec/controllers/projects/milestones_controller_spec.rb

@@ -5,6 +5,7 @@ describe Projects::MilestonesController do
   let(:user)    { create(:user) }
   let(:milestone) { create(:milestone, project: project) }
   let(:issue) { create(:issue, project: project, milestone: milestone) }
+  let!(:label) { create(:label, project: project, title: 'Issue Label', issues: [issue]) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project, milestone: milestone) }
   before do
@@ -13,6 +14,20 @@ describe Projects::MilestonesController do
     controller.instance_variable_set(:@project, project)
   end
+  describe "#show" do
+    render_views
+
+    def view_milestone
+      get :show, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid
+    end
+
+    it 'shows milestone page' do
+      view_milestone
+
+      expect(response).to have_http_status(200)
+    end
+  end
+
   describe "#destroy" do
     it "removes milestone" do
       expect(issue.milestone_id).to eq(milestone.id)

spec/controllers/projects/pipelines_controller_spec.rb

 require 'spec_helper'
 describe Projects::PipelinesController do
-  include ApiHelpers
-
   let(:user) { create(:user) }
   let(:project) { create(:empty_project, :public) }

spec/controllers/projects/todo_controller_spec.rb

 require('spec_helper')
 describe Projects::TodosController do
-  include ApiHelpers
-
   let(:user)          { create(:user) }
   let(:project)       { create(:empty_project) }
   let(:issue)         { create(:issue, project: project) }

spec/features/admin/admin_labels_spec.rb

 require 'spec_helper'
 RSpec.describe 'admin issues labels' do
-  include WaitForAjax
-
   let!(:bug_label) { Label.create(title: 'bug', template: true) }
   let!(:feature_label) { Label.create(title: 'feature', template: true) }

spec/features/admin/admin_users_spec.rb

 require 'spec_helper'
 describe "Admin::Users", feature: true do
-  include WaitForAjax
-
   let!(:user) do
     create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
   end

spec/features/auto_deploy_spec.rb

 require 'spec_helper'
 describe 'Auto deploy' do
-  include WaitForAjax
-
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   before do
     project.create_kubernetes_service(

spec/features/boards/add_issues_modal_spec.rb

 require 'rails_helper'
 describe 'Issue Boards add issue modal', :feature, :js do
-  include WaitForAjax
   include WaitForVueResource
   let(:project) { create(:empty_project, :public) }

spec/features/boards/boards_spec.rb

 require 'rails_helper'
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
   include DragTo

spec/features/boards/new_issue_spec.rb

 require 'rails_helper'
 describe 'Issue Boards new issue', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
   let(:project) { create(:empty_project, :public) }

spec/features/boards/sidebar_spec.rb

 require 'rails_helper'
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
   let(:user)         { create(:user) }

spec/features/calendar_spec.rb

 require 'spec_helper'
 feature 'Contributions Calendar', :feature, :js do
-  include WaitForAjax
-
   let(:user) { create(:user) }
-  let(:contributed_project) { create(:project, :public) }
+  let(:contributed_project) { create(:empty_project, :public) }
   let(:issue_note) { create(:note, project: contributed_project) }
   # Ex/ Sunday Jan 1, 2016

spec/features/commits_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Commits' do
   include CiStatusHelper
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   describe 'CI' do
     before do

spec/features/copy_as_gfm_spec.rb

@@ -433,7 +433,7 @@ describe 'Copy as GFM', feature: true, js: true do
   end
   describe 'Copying code' do
-    let(:project) { create(:project) }
+    let(:project) { create(:project, :repository) }
     context 'from a diff' do
       before do

spec/features/cycle_analytics_spec.rb

 require 'spec_helper'
 feature 'Cycle Analytics', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:guest) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:issue) { create(:issue, project: project, created_at: 2.days.ago) }
   let(:milestone) { create(:milestone, project: project) }
   let(:mr) { create_merge_request_closing_issue(issue) }

spec/features/dashboard/datetime_on_tooltips_spec.rb

 require 'spec_helper'
 feature 'Tooltips on .timeago dates', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)            { create(:user) }
   let(:project)         { create(:project, name: 'test', namespace: user.namespace) }
   let(:created_date)    { Date.yesterday.to_time }

spec/features/dashboard/groups_list_spec.rb

 require 'spec_helper'
 describe 'Dashboard Groups page', js: true, feature: true do
-  include WaitForAjax
-
   let!(:user) { create :user }
   let!(:group) { create(:group) }
   let!(:nested_group) { create(:group, :nested) }

spec/features/dashboard/project_member_activity_index_spec.rb

 require 'spec_helper'
 feature 'Project member activity', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)            { create(:user) }
   let(:project)         { create(:empty_project, :public, name: 'x', namespace: user.namespace) }

spec/features/dashboard_issues_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 describe "Dashboard Issues filtering", feature: true, js: true do
   let(:user)      { create(:user) }
-  let(:project)   { create(:project) }
+  let(:project)   { create(:empty_project) }
   let(:milestone) { create(:milestone, project: project) }
   context 'filtering by milestone' do