Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue

26 files changed, 575 insertions, 137 deletions

diff --git a/spec/controllers/blame_controller_spec.rb b/spec/controllers/blame_controller_spec.rb
index 3ad4d5fc0a8..25f06299a29 100644
--- a/spec/controllers/blame_controller_spec.rb
+++ b/spec/controllers/blame_controller_spec.rb
@@ -24,20 +24,6 @@ describe Projects::BlameController do
     context "valid file" do
       let(:id) { 'master/files/ruby/popen.rb' }
       it { is_expected.to respond_with(:success) }
-
-      it 'groups blames properly' do
-        blame = assigns(:blame)
-        # Sanity check a few items
-        expect(blame.count).to eq(18)
-        expect(blame[0][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
-        expect(blame[0][:lines]).to eq(["require 'fileutils'", "require 'open3'", ""])
-
-        expect(blame[1][:commit].sha).to eq('874797c3a73b60d2187ed6e2fcabd289ff75171e')
-        expect(blame[1][:lines]).to eq(["module Popen", "  extend self"])
-
-        expect(blame[-1][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
-        expect(blame[-1][:lines]).to eq(["  end", "end"])
-      end
     end
   end
 end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
new file mode 100644
index 00000000000..938e97298b6
--- /dev/null
+++ b/spec/controllers/groups_controller_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe GroupsController do
+  describe 'GET index' do
+    context 'as a user' do
+      it 'redirects to Groups Dashboard' do
+        sign_in(create(:user))
+
+        get :index
+
+        expect(response).to redirect_to(dashboard_groups_path)
+      end
+    end
+
+    context 'as a guest' do
+      it 'redirects to Explore Groups' do
+        get :index
+
+        expect(response).to redirect_to(explore_groups_path)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb
new file mode 100644
index 00000000000..85d1d1e0524
--- /dev/null
+++ b/spec/controllers/projects/imports_controller_spec.rb
@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe Projects::ImportsController do
+  let(:user) { create(:user) }
+
+  describe 'GET #show' do
+    context 'when repository does not exists' do
+      let(:project) { create(:empty_project) }
+
+      before do
+        sign_in(user)
+        project.team << [user, :master]
+      end
+
+      it 'renders template' do
+        get :show, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+        expect(response).to render_template :show
+      end
+
+      it 'sets flash.now if params is present' do
+        get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'Started' }
+
+        expect(flash.now[:notice]).to eq 'Started'
+      end
+    end
+
+    context 'when repository exists' do
+      let(:project) { create(:project_empty_repo, import_url: 'https://github.com/vim/vim.git') }
+
+      before do
+        sign_in(user)
+        project.team << [user, :master]
+      end
+
+      context 'when import is in progress' do
+        before do
+          project.update_attribute(:import_status, :started)
+        end
+
+        it 'renders template' do
+          get :show, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+          expect(response).to render_template :show
+        end
+
+        it 'sets flash.now if params is present' do
+          get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'In progress' }
+
+          expect(flash.now[:notice]).to eq 'In progress'
+        end
+      end
+
+      context 'when import failed' do
+        before do
+          project.update_attribute(:import_status, :failed)
+        end
+
+        it 'redirects to new_namespace_project_import_path' do
+          get :show, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+          expect(response).to redirect_to new_namespace_project_import_path(project.namespace, project)
+        end
+      end
+
+      context 'when import finished' do
+        before do
+          project.update_attribute(:import_status, :finished)
+        end
+
+        context 'when project is a fork' do
+          it 'redirects to namespace_project_path' do
+            allow_any_instance_of(Project).to receive(:forked?).and_return(true)
+
+            get :show, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+            expect(flash[:notice]).to eq 'The project was successfully forked.'
+            expect(response).to redirect_to namespace_project_path(project.namespace, project)
+          end
+        end
+
+        context 'when project is external' do
+          it 'redirects to namespace_project_path' do
+            get :show, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+            expect(flash[:notice]).to eq 'The project was successfully imported.'
+            expect(response).to redirect_to namespace_project_path(project.namespace, project)
+          end
+        end
+
+        context 'when continue params is present' do
+          let(:params) do
+            {
+              to: namespace_project_path(project.namespace, project),
+              notice: 'Finished'
+            }
+          end
+
+          it 'redirects to params[:to]' do
+            get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: params
+
+            expect(flash[:notice]).to eq params[:notice]
+            expect(response).to redirect_to params[:to]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index 8898b71e2a3..b7c2b32cb13 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -1,11 +1,15 @@
 FactoryGirl.define do
   factory :commit_status, class: CommitStatus do
-    started_at 'Di 29. Okt 09:51:28 CET 2013'
-    finished_at 'Di 29. Okt 09:53:28 CET 2013'
     name 'default'
     status 'success'
     description 'commit status'
     commit factory: :ci_commit_with_one_job
+    started_at 'Tue, 26 Jan 2016 08:21:42 +0100'
+    finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
+
+    after(:build) do |build, evaluator|
+      build.project = build.commit.project
+    end
 
     factory :generic_commit_status, class: GenericCommitStatus do
       name 'generic'
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index fe7f07f5b75..5a62da10619 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -16,83 +16,104 @@ describe 'Commits' do
       FactoryGirl.create :ci_commit, project: project, sha: project.commit.sha
     end
 
-    let!(:build) { FactoryGirl.create :ci_build, commit: commit }
+    context 'commit status is Generic Commit Status' do
+      let!(:status) { FactoryGirl.create :generic_commit_status, commit: commit }
 
-    describe 'Project commits' do
-      before do
-        visit namespace_project_commits_path(project.namespace, project, :master)
-      end
+      describe 'Commit builds' do
+        before do
+          visit ci_status_path(commit)
+        end
 
-      it 'should show build status' do
-        page.within("//li[@id='commit-#{commit.short_sha}']") do
-          expect(page).to have_css(".ci-status-link")
+        it { expect(page).to have_content commit.sha[0..7] }
+
+        it 'contains generic commit status build' do
+          page.within('.table-holder') do
+            expect(page).to have_content "##{status.id}" # build id
+            expect(page).to have_content 'generic'       # build name
+          end
         end
       end
     end
 
-    describe 'Commit builds' do
-      before do
-        visit ci_status_path(commit)
-      end
-
-      it { expect(page).to have_content commit.sha[0..7] }
-      it { expect(page).to have_content commit.git_commit_message }
-      it { expect(page).to have_content commit.git_author_name }
-    end
+    context 'commit status is Ci Build' do
+      let!(:build) { FactoryGirl.create :ci_build, commit: commit }
 
-    context 'Download artifacts' do
-      let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+      describe 'Project commits' do
+        before do
+          visit namespace_project_commits_path(project.namespace, project, :master)
+        end
 
-      before do
-        build.update_attributes(artifacts_file: artifacts_file)
+        it 'should show build status' do
+          page.within("//li[@id='commit-#{commit.short_sha}']") do
+            expect(page).to have_css(".ci-status-link")
+          end
+        end
       end
 
-      it do
-        visit ci_status_path(commit)
-        click_on 'Download artifacts'
-        expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
-      end
-    end
+      describe 'Commit builds' do
+        before do
+          visit ci_status_path(commit)
+        end
 
-    describe 'Cancel all builds' do
-      it 'cancels commit' do
-        visit ci_status_path(commit)
-        click_on 'Cancel running'
-        expect(page).to have_content 'canceled'
+        it { expect(page).to have_content commit.sha[0..7] }
+        it { expect(page).to have_content commit.git_commit_message }
+        it { expect(page).to have_content commit.git_author_name }
       end
-    end
 
-    describe 'Cancel build' do
-      it 'cancels build' do
-        visit ci_status_path(commit)
-        click_on 'Cancel'
-        expect(page).to have_content 'canceled'
-      end
-    end
+      context 'Download artifacts' do
+        let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+
+        before do
+          build.update_attributes(artifacts_file: artifacts_file)
+        end
 
-    describe '.gitlab-ci.yml not found warning' do
-      context 'ci builds enabled' do
-        it "does not show warning" do
+        it do
           visit ci_status_path(commit)
-          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          click_on 'Download artifacts'
+          expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
         end
+      end
 
-        it 'shows warning' do
-          stub_ci_commit_yaml_file(nil)
+      describe 'Cancel all builds' do
+        it 'cancels commit' do
           visit ci_status_path(commit)
-          expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+          click_on 'Cancel running'
+          expect(page).to have_content 'canceled'
         end
       end
 
-      context 'ci builds disabled' do
-        before do
-          stub_ci_builds_disabled
-          stub_ci_commit_yaml_file(nil)
+      describe 'Cancel build' do
+        it 'cancels build' do
           visit ci_status_path(commit)
+          click_on 'Cancel'
+          expect(page).to have_content 'canceled'
         end
+      end
+
+      describe '.gitlab-ci.yml not found warning' do
+        context 'ci builds enabled' do
+          it "does not show warning" do
+            visit ci_status_path(commit)
+            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          end
+
+          it 'shows warning' do
+            stub_ci_commit_yaml_file(nil)
+            visit ci_status_path(commit)
+            expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+          end
+        end
+
+        context 'ci builds disabled' do
+          before do
+            stub_ci_builds_disabled
+            stub_ci_commit_yaml_file(nil)
+            visit ci_status_path(commit)
+          end
 
-        it 'does not show warning' do
-          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          it 'does not show warning' do
+            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          end
         end
       end
     end
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 2451e56fe7c..dac9205449a 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -112,10 +112,10 @@ feature 'Login', feature: true do
       context 'within the grace period' do
         it 'redirects to two-factor configuration page' do
           expect(current_path).to eq new_profile_two_factor_auth_path
-          expect(page).to have_content('You must configure Two-Factor Authentication in your account until')
+          expect(page).to have_content('You must enable Two-factor Authentication for your account before')
         end
 
-        it 'two-factor configuration is skippable' do
+        it 'disallows skipping two-factor configuration' do
           expect(current_path).to eq new_profile_two_factor_auth_path
 
           click_link 'Configure it later'
@@ -128,10 +128,10 @@ feature 'Login', feature: true do
 
         it 'redirects to two-factor configuration page' do
           expect(current_path).to eq new_profile_two_factor_auth_path
-          expect(page).to have_content('You must configure Two-Factor Authentication in your account.')
+          expect(page).to have_content('You must enable Two-factor Authentication for your account.')
         end
 
-        it 'two-factor configuration is not skippable' do
+        it 'disallows skipping two-factor configuration' do
           expect(current_path).to eq new_profile_two_factor_auth_path
           expect(page).not_to have_link('Configure it later')
         end
@@ -146,7 +146,7 @@ feature 'Login', feature: true do
 
       it 'redirects to two-factor configuration page' do
         expect(current_path).to eq new_profile_two_factor_auth_path
-        expect(page).to have_content('You must configure Two-Factor Authentication in your account.')
+        expect(page).to have_content('You must enable Two-factor Authentication for your account.')
       end
     end
   end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index f0fc6916c4d..1a360cd1ebc 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -167,7 +167,7 @@ describe 'Comments', feature: true do
         end
 
         it 'should be removed when canceled' do
-          page.within(".diff-file form[rel$='#{line_code}']") do
+          page.within(".diff-file form[id$='#{line_code}']") do
             find('.js-close-discussion-note-form').trigger('click')
           end
 
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index 0c8d06b7059..0b9176357bc 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -66,5 +66,10 @@ describe LabelsHelper do
     it 'uses dark text on light backgrounds' do
       expect(text_color_for_bg('#EEEEEE')).to eq('#333333')
     end
+
+    it 'supports RGB triplets' do
+      expect(text_color_for_bg('#FFF')).to eq '#333333'
+      expect(text_color_for_bg('#000')).to eq '#FFFFFF'
+    end
   end
 end
diff --git a/spec/lib/banzai/filter/sanitization_filter_spec.rb b/spec/lib/banzai/filter/sanitization_filter_spec.rb
index 760d60a4190..9c63d227044 100644
--- a/spec/lib/banzai/filter/sanitization_filter_spec.rb
+++ b/spec/lib/banzai/filter/sanitization_filter_spec.rb
@@ -75,6 +75,11 @@ describe Banzai::Filter::SanitizationFilter, lib: true do
       expect(filter(act).to_html).to eq exp
     end
 
+    it 'allows `abbr` elements' do
+      exp = act = %q{<abbr title="HyperText Markup Language">HTML</abbr>}
+      expect(filter(act).to_html).to eq exp
+    end
+
     it 'removes `rel` attribute from `a` elements' do
       act = %q{<a href="#" rel="nofollow">Link</a>}
       exp = %q{<a href="#">Link</a>}
diff --git a/spec/lib/gitlab/blame_spec.rb b/spec/lib/gitlab/blame_spec.rb
new file mode 100644
index 00000000000..89245761b6f
--- /dev/null
+++ b/spec/lib/gitlab/blame_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Gitlab::Blame, lib: true do
+  let(:project) { create(:project) }
+  let(:path) { 'files/ruby/popen.rb' }
+  let(:commit) { project.commit('master') }
+  let(:blob) { project.repository.blob_at(commit.id, path) }
+
+  describe "#groups" do
+    let(:subject) { described_class.new(blob, commit).groups(highlight: false) }
+
+    it 'groups lines properly' do
+      expect(subject.count).to eq(18)
+      expect(subject[0][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
+      expect(subject[0][:lines]).to eq(["require 'fileutils'", "require 'open3'", ""])
+
+      expect(subject[1][:commit].sha).to eq('874797c3a73b60d2187ed6e2fcabd289ff75171e')
+      expect(subject[1][:lines]).to eq(["module Popen", "  extend self"])
+
+      expect(subject[-1][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
+      expect(subject[-1][:lines]).to eq(["  end", "end"])
+    end
+  end
+end
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb
index 99288da1e43..04cf11fc6f1 100644
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
@@ -135,6 +135,17 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
         message = "resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
+
+      context 'with an external issue tracker reference' do
+        it 'extracts the referenced issue' do
+          jira_project = create(:jira_project, name: 'JIRA_EXT1')
+          jira_issue = ExternalIssue.new("#{jira_project.name}-1", project: jira_project)
+          closing_issue_extractor = described_class.new jira_project
+          message = "Resolve #{jira_issue.to_reference}"
+
+          expect(closing_issue_extractor.closed_by_message(message)).to eq([jira_issue])
+        end
+      end
     end
 
     context "with a cross-project reference" do
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index 2a37cd40dde..ad4290c43bb 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -66,6 +66,16 @@ describe Gitlab::Metrics::Instrumentation do
 
         @dummy.foo
       end
+
+      it 'generates a method with the correct arity when using methods without arguments' do
+        dummy = Class.new do
+          def self.test; end
+        end
+
+        described_class.instrument_method(dummy, :test)
+
+        expect(dummy.method(:test).arity).to eq(0)
+      end
     end
 
     describe 'with metrics disabled' do
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index d30bc7d0554..606340d87e4 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ci::Build, models: true do
-  let(:project) { FactoryGirl.create :empty_project }
+  let(:project) { FactoryGirl.create :project }
   let(:commit) { FactoryGirl.create :ci_commit, project: project }
   let(:build) { FactoryGirl.create :ci_build, commit: commit }
 
diff --git a/spec/models/concerns/case_sensitivity_spec.rb b/spec/models/concerns/case_sensitivity_spec.rb
index 25b3f4e50da..92fdc5cd65d 100644
--- a/spec/models/concerns/case_sensitivity_spec.rb
+++ b/spec/models/concerns/case_sensitivity_spec.rb
@@ -37,7 +37,7 @@ describe CaseSensitivity, models: true do
             with(%q{LOWER("foo"."bar") = LOWER(:value)}, value: 'bar').
             and_return(criteria)
 
-          expect(model.iwhere(:'foo.bar' => 'bar')).to eq(criteria)
+          expect(model.iwhere('foo.bar'.to_sym => 'bar')).to eq(criteria)
         end
       end
 
@@ -87,8 +87,8 @@ describe CaseSensitivity, models: true do
             with(%q{LOWER("foo"."baz") = LOWER(:value)}, value: 'baz').
             and_return(final)
 
-          got = model.iwhere(:'foo.bar' => 'bar',
-                             :'foo.baz' => 'baz')
+          got = model.iwhere('foo.bar'.to_sym => 'bar',
+                             'foo.baz'.to_sym => 'baz')
 
           expect(got).to eq(final)
         end
@@ -127,7 +127,7 @@ describe CaseSensitivity, models: true do
             with(%q{`foo`.`bar` = :value}, value: 'bar').
             and_return(criteria)
 
-          expect(model.iwhere(:'foo.bar' => 'bar')).
+          expect(model.iwhere('foo.bar'.to_sym => 'bar')).
             to eq(criteria)
         end
       end
@@ -178,8 +178,8 @@ describe CaseSensitivity, models: true do
             with(%q{`foo`.`baz` = :value}, value: 'baz').
             and_return(final)
 
-          got = model.iwhere(:'foo.bar' => 'bar',
-                             :'foo.baz' => 'baz')
+          got = model.iwhere('foo.bar'.to_sym => 'bar',
+                             'foo.baz'.to_sym => 'baz')
 
           expect(got).to eq(final)
         end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 071582b0282..ec2a923f91b 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -65,27 +65,6 @@ describe Event, models: true do
     it { expect(@event.author).to eq(@user) }
   end
 
-  describe '.latest_update_time' do
-    describe 'when events are present' do
-      let(:time) { Time.utc(2015, 1, 1) }
-
-      before do
-        create(:closed_issue_event, updated_at: time)
-        create(:closed_issue_event, updated_at: time + 5)
-      end
-
-      it 'returns the latest update time' do
-        expect(Event.latest_update_time).to eq(time + 5)
-      end
-    end
-
-    describe 'when no events exist' do
-      it 'returns nil' do
-        expect(Event.latest_update_time).to be_nil
-      end
-    end
-  end
-
   describe '.limit_recent' do
     let!(:event1) { create(:closed_issue_event) }
     let!(:event2) { create(:closed_issue_event) }
diff --git a/spec/models/external_issue_spec.rb b/spec/models/external_issue_spec.rb
index 6ec6b9037a4..9b144dd1ecc 100644
--- a/spec/models/external_issue_spec.rb
+++ b/spec/models/external_issue_spec.rb
@@ -10,6 +10,21 @@ describe ExternalIssue, models: true do
     it { is_expected.to include_module(Referable) }
   end
 
+  describe '.reference_pattern' do
+    it 'allows underscores in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+
+    it 'allows numbers in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT3_EXT-1234')[0]).to eq 'EXT3_EXT-1234'
+    end
+
+    it 'requires the project name to begin with A-Z' do
+      expect(ExternalIssue.reference_pattern.match('3EXT_EXT-1234')).to eq nil
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+  end
+
   describe '#to_reference' do
     it 'returns a String reference to the object' do
       expect(issue.to_reference).to eq issue.id
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index afbf62035ac..c484ae8fc8c 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -219,4 +219,24 @@ describe Repository, models: true do
       end
     end
   end
+
+  describe '#has_visible_content?' do
+    subject { repository.has_visible_content? }
+
+    describe 'when there are no branches' do
+      before do
+        allow(repository.raw_repository).to receive(:branch_count).and_return(0)
+      end
+
+      it { is_expected.to eq(false) }
+    end
+
+    describe 'when there are branches' do
+      before do
+        allow(repository.raw_repository).to receive(:branch_count).and_return(3)
+      end
+
+      it { is_expected.to eq(true) }
+    end
+  end
 end
diff --git a/spec/models/tree_spec.rb b/spec/models/tree_spec.rb
new file mode 100644
index 00000000000..0737999e125
--- /dev/null
+++ b/spec/models/tree_spec.rb
@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Tree, models: true do
+  let(:repository) { create(:project).repository }
+  let(:sha) { repository.root_ref }
+
+  subject { described_class.new(repository, '54fcc214') }
+
+  describe '#readme' do
+    class FakeBlob
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def readme?
+        name =~ /^readme/i
+      end
+    end
+
+    it 'returns nil when repository does not contains a README file' do
+      files = [FakeBlob.new('file'), FakeBlob.new('license'), FakeBlob.new('copying')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme).to eq nil
+    end
+
+    it 'returns nil when repository does not contains a previewable README file' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README.pages'), FakeBlob.new('README.png')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme).to eq nil
+    end
+
+    it 'returns README when repository contains a previewable README file' do
+      files = [FakeBlob.new('README.png'), FakeBlob.new('README'), FakeBlob.new('file')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README'
+    end
+
+    it 'returns first previewable README when repository contains more than one' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README.md'), FakeBlob.new('README.asciidoc')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README.md'
+    end
+
+    it 'returns first plain text README when repository contains more than one' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README'), FakeBlob.new('README.txt')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README'
+    end
+
+    it 'prioritizes previewable README file over one in plain text' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README'), FakeBlob.new('README.md')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README.md'
+    end
+  end
+end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index e194eb93cf4..d7bfa17b0b1 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -109,9 +109,9 @@ describe API::API, api: true  do
     end
   end
 
-  describe "GET /projects/:id/merge_request/:merge_request_id" do
+  describe "GET /projects/:id/merge_requests/:merge_request_id" do
     it "should return merge_request" do
-      get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
+      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq(merge_request.title)
       expect(json_response['iid']).to eq(merge_request.iid)
@@ -126,14 +126,14 @@ describe API::API, api: true  do
     end
 
     it "should return a 404 error if merge_request_id not found" do
-      get api("/projects/#{project.id}/merge_request/999", user)
+      get api("/projects/#{project.id}/merge_requests/999", user)
       expect(response.status).to eq(404)
     end
   end
 
-  describe 'GET /projects/:id/merge_request/:merge_request_id/commits' do
+  describe 'GET /projects/:id/merge_requests/:merge_request_id/commits' do
     context 'valid merge request' do
-      before { get api("/projects/#{project.id}/merge_request/#{merge_request.id}/commits", user) }
+      before { get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/commits", user) }
       let(:commit) { merge_request.commits.first }
 
       it { expect(response.status).to eq 200 }
@@ -143,20 +143,20 @@ describe API::API, api: true  do
     end
 
     it 'returns a 404 when merge_request_id not found' do
-      get api("/projects/#{project.id}/merge_request/999/commits", user)
+      get api("/projects/#{project.id}/merge_requests/999/commits", user)
       expect(response.status).to eq(404)
     end
   end
 
-  describe 'GET /projects/:id/merge_request/:merge_request_id/changes' do
+  describe 'GET /projects/:id/merge_requests/:merge_request_id/changes' do
     it 'should return the change information of the merge_request' do
-      get api("/projects/#{project.id}/merge_request/#{merge_request.id}/changes", user)
+      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/changes", user)
       expect(response.status).to eq 200
       expect(json_response['changes'].size).to eq(merge_request.diffs.size)
     end
 
     it 'returns a 404 when merge_request_id not found' do
-      get api("/projects/#{project.id}/merge_request/999/changes", user)
+      get api("/projects/#{project.id}/merge_requests/999/changes", user)
       expect(response.status).to eq(404)
     end
   end
@@ -311,19 +311,19 @@ describe API::API, api: true  do
     end
   end
 
-  describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
+  describe "PUT /projects/:id/merge_requests/:merge_request_id to close MR" do
     it "should return merge_request" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), state_event: "close"
       expect(response.status).to eq(200)
       expect(json_response['state']).to eq('closed')
     end
   end
 
-  describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
+  describe "PUT /projects/:id/merge_requests/:merge_request_id/merge" do
     let(:ci_commit) { create(:ci_commit_without_jobs) }
 
     it "should return merge_request in case of success" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
       expect(response.status).to eq(200)
     end
@@ -332,7 +332,7 @@ describe API::API, api: true  do
       allow_any_instance_of(MergeRequest).
         to receive(:can_be_merged?).and_return(false)
 
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
       expect(response.status).to eq(406)
       expect(json_response['message']).to eq('Branch cannot be merged')
@@ -340,14 +340,14 @@ describe API::API, api: true  do
 
     it "should return 405 if merge_request is not open" do
       merge_request.close
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
       expect(response.status).to eq(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
     it "should return 405 if merge_request is a work in progress" do
       merge_request.update_attribute(:title, "WIP: #{merge_request.title}")
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
       expect(response.status).to eq(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
@@ -355,7 +355,7 @@ describe API::API, api: true  do
     it "should return 401 if user has no permissions to merge" do
       user2 = create(:user)
       project.team << [user2, :reporter]
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user2)
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user2)
       expect(response.status).to eq(401)
       expect(json_response['message']).to eq('401 Unauthorized')
     end
@@ -364,7 +364,7 @@ describe API::API, api: true  do
       allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
       allow(ci_commit).to receive(:active?).and_return(true)
 
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
 
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq('Test')
@@ -372,33 +372,33 @@ describe API::API, api: true  do
     end
   end
 
-  describe "PUT /projects/:id/merge_request/:merge_request_id" do
+  describe "PUT /projects/:id/merge_requests/:merge_request_id" do
     it "should return merge_request" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), title: "New title"
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq('New title')
     end
 
     it "should return merge_request" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), description: "New description"
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), description: "New description"
       expect(response.status).to eq(200)
       expect(json_response['description']).to eq('New description')
     end
 
     it "should return 400 when source_branch is specified" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user),
       source_branch: "master", target_branch: "master"
       expect(response.status).to eq(400)
     end
 
     it "should return merge_request with renamed target_branch" do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), target_branch: "wiki"
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki"
       expect(response.status).to eq(200)
       expect(json_response['target_branch']).to eq('wiki')
     end
 
     it 'should return 400 on invalid label names' do
-      put api("/projects/#{project.id}/merge_request/#{merge_request.id}",
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}",
               user),
           title: 'new issue',
           labels: 'label, ?'
@@ -407,11 +407,11 @@ describe API::API, api: true  do
     end
   end
 
-  describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
+  describe "POST /projects/:id/merge_requests/:merge_request_id/comments" do
     it "should return comment" do
       original_count = merge_request.notes.size
 
-      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user), note: "My comment"
       expect(response.status).to eq(201)
       expect(json_response['note']).to eq('My comment')
       expect(json_response['author']['name']).to eq(user.name)
@@ -420,20 +420,20 @@ describe API::API, api: true  do
     end
 
     it "should return 400 if note is missing" do
-      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
       expect(response.status).to eq(400)
     end
 
     it "should return 404 if note is attached to non existent merge request" do
-      post api("/projects/#{project.id}/merge_request/404/comments", user),
+      post api("/projects/#{project.id}/merge_requests/404/comments", user),
            note: 'My comment'
       expect(response.status).to eq(404)
     end
   end
 
-  describe "GET :id/merge_request/:merge_request_id/comments" do
+  describe "GET :id/merge_requests/:merge_request_id/comments" do
     it "should return merge_request comments ordered by created_at" do
-      get api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
+      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
       expect(response.status).to eq(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
@@ -443,7 +443,7 @@ describe API::API, api: true  do
     end
 
     it "should return a 404 error if merge_request_id not found" do
-      get api("/projects/#{project.id}/merge_request/999/comments", user)
+      get api("/projects/#{project.id}/merge_requests/999/comments", user)
       expect(response.status).to eq(404)
     end
   end
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index eec927102aa..244947762dd 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -113,6 +113,21 @@ describe Ci::API::API do
         expect(json_response["depends_on_builds"].count).to eq(2)
         expect(json_response["depends_on_builds"][0]["name"]).to eq("rspec")
       end
+
+      %w(name version revision platform architecture).each do |param|
+        context "updates runner #{param}" do
+          let(:value) { "#{param}_value" }
+
+          subject { runner.read_attribute(param.to_sym) }
+
+          it do
+            post ci_api("/builds/register"), token: runner.token, info: { param => value }
+            expect(response.status).to eq(404)
+            runner.reload
+            is_expected.to eq(value)
+          end
+        end
+      end
     end
 
     describe "PUT /builds/:id" do
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index 5942aa7a1b5..db8189ffb79 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -51,6 +51,20 @@ describe Ci::API::API do
 
       expect(response.status).to eq(400)
     end
+
+    %w(name version revision platform architecture).each do |param|
+      context "creates runner with #{param} saved" do
+        let(:value) { "#{param}_value" }
+
+        subject { Ci::Runner.first.read_attribute(param.to_sym) }
+
+        it do
+          post ci_api("/runners/register"), token: registration_token, info: { param => value }
+          expect(response.status).to eq(201)
+          is_expected.to eq(value)
+        end
+      end
+    end
   end
 
   describe "DELETE /runners/delete" do
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 22ba25217f0..22937226fce 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -496,11 +496,11 @@ end
 
 describe Projects::ForksController, 'routing' do
   it 'to #new' do
-    expect(get('/gitlab/gitlabhq/fork/new')).to route_to('projects/forks#new', namespace_id: 'gitlab', project_id: 'gitlabhq')
+    expect(get('/gitlab/gitlabhq/forks/new')).to route_to('projects/forks#new', namespace_id: 'gitlab', project_id: 'gitlabhq')
   end
 
   it 'to #create' do
-    expect(post('/gitlab/gitlabhq/fork')).to route_to('projects/forks#create', namespace_id: 'gitlab', project_id: 'gitlabhq')
+    expect(post('/gitlab/gitlabhq/forks')).to route_to('projects/forks#create', namespace_id: 'gitlab', project_id: 'gitlabhq')
   end
 end
 
diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb
new file mode 100644
index 00000000000..04f474c736c
--- /dev/null
+++ b/spec/services/projects/import_service_spec.rb
@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Projects::ImportService, services: true do
+  let!(:project) { create(:empty_project) }
+  let(:user) { project.creator }
+
+  subject { described_class.new(project, user) }
+
+  describe '#execute' do
+    context 'with unknown url' do
+      before do
+        project.import_url = Project::UNKNOWN_IMPORT_URL
+      end
+
+      it 'succeeds if repository is created successfully' do
+        expect(project).to receive(:create_repository).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if repository creation fails' do
+        expect(project).to receive(:create_repository).and_return(false)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'The repository could not be created.'
+      end
+    end
+
+    context 'with known url' do
+      before do
+        project.import_url = 'https://github.com/vim/vim.git'
+      end
+
+      it 'succeeds if repository import is successfully' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if repository import fails' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_raise(Gitlab::Shell::Error.new('Failed to import the repository'))
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'Failed to import the repository'
+      end
+    end
+
+    context 'with valid importer' do
+      before do
+        stub_github_omniauth_provider
+
+        project.import_url = 'https://github.com/vim/vim.git'
+        project.import_type = 'github'
+
+        allow(project).to receive(:import_data).and_return(double.as_null_object)
+      end
+
+      it 'succeeds if importer succeeds' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if importer fails' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_return(false)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'The remote data could not be imported.'
+      end
+
+      it 'fails if importer raise an error' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_raise(Projects::ImportService::Error.new('Github: failed to connect API'))
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'Github: failed to connect API'
+      end
+    end
+
+    def stub_github_omniauth_provider
+      provider = OpenStruct.new(
+        name: 'github',
+        app_id: 'asd123',
+        app_secret: 'asd123'
+      )
+
+      Gitlab.config.omniauth.providers << provider
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0225a0ee53f..8f381f46e57 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,4 +48,10 @@ FactoryGirl::SyntaxRunner.class_eval do
   include RSpec::Mocks::ExampleMethods
 end
 
+# Work around a Rails 4.2.5.1 issue
+# See https://github.com/rspec/rspec-rails/issues/1532
+RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do
+  alias_method :find_all_anywhere, :find_all
+end
+
 ActiveRecord::Migration.maintain_test_schema!
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index fed1ab6ee33..a698f484df1 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -19,3 +19,9 @@ unless ENV['CI'] || ENV['CI_SERVER']
   # Keep only the screenshots generated from the last failing test suite
   Capybara::Screenshot.prune_strategy = :keep_last_run
 end
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    TestEnv.warm_asset_cache
+  end
+end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 4f4743bff6d..0d1bd030f3c 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -146,6 +146,22 @@ module TestEnv
     FileUtils.chmod_R 0755, target_repo_path
   end
 
+  # When no cached assets exist, manually hit the root path to create them
+  #
+  # Otherwise they'd be created by the first test, often timing out and
+  # causing a transient test failure
+  def warm_asset_cache
+    return if warm_asset_cache?
+    return unless defined?(Capybara)
+
+    Capybara.current_session.driver.visit '/'
+  end
+
+  def warm_asset_cache?
+    cache = Rails.root.join(*%w(tmp cache assets test))
+    Dir.exist?(cache) && Dir.entries(cache).length > 2
+  end
+
   private
 
   def factory_repo_path
@@ -172,7 +188,6 @@ module TestEnv
     'gitlab-test-fork'
   end
 
-
   # Prevent developer git configurations from being persisted to test
   # repositories
   def git_env