Merge branch 'master' into ci/persist-registration-token

* master:
  Move CI admin builds and runners specs to correct directory
  Fix 500 when viewing specific runners on runners page
  Fix Ci::Project migration not migrating columns that cannot be NULL
  Fix MySQL migration of CI emails
  Minor fix in flow 'Merge when build succeeds'

2 files changed, 155 insertions, 0 deletions

diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
new file mode 100644
index 00000000000..72764b1629d
--- /dev/null
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe "Admin Builds" do
+  let(:commit) { FactoryGirl.create :ci_commit }
+  let(:build) { FactoryGirl.create :ci_build, commit: commit }
+
+  before do
+    login_as :admin
+  end
+
+  describe "GET /admin/builds" do
+    before do
+      build
+      visit admin_builds_path
+    end
+
+    it { expect(page).to have_content "Running" }
+    it { expect(page).to have_content build.short_sha }
+  end
+
+  describe "Tabs" do
+    it "shows all builds" do
+      FactoryGirl.create :ci_build, commit: commit, status: "pending"
+      FactoryGirl.create :ci_build, commit: commit, status: "running"
+      FactoryGirl.create :ci_build, commit: commit, status: "success"
+      FactoryGirl.create :ci_build, commit: commit, status: "failed"
+
+      visit admin_builds_path
+
+      within ".center-top-menu" do
+        click_on "All"
+      end
+
+      expect(page.all(".build-link").size).to eq(4)
+    end
+
+    it "shows finished builds" do
+      build = FactoryGirl.create :ci_build, commit: commit, status: "pending"
+      build1 = FactoryGirl.create :ci_build, commit: commit, status: "running"
+      build2 = FactoryGirl.create :ci_build, commit: commit, status: "success"
+
+      visit admin_builds_path
+
+      within ".center-top-menu" do
+        click_on "Finished"
+      end
+
+      expect(page.find(".build-link")).not_to have_content(build.id)
+      expect(page.find(".build-link")).not_to have_content(build1.id)
+      expect(page.find(".build-link")).to have_content(build2.id)
+    end
+
+    it "shows running builds" do
+      build = FactoryGirl.create :ci_build, commit: commit, status: "pending"
+      build2 = FactoryGirl.create :ci_build, commit: commit, status: "success"
+      build3 = FactoryGirl.create :ci_build, commit: commit, status: "failed"
+
+      visit admin_builds_path
+
+      within ".center-top-menu" do
+        click_on "Running"
+      end
+
+      expect(page.find(".build-link")).to have_content(build.id)
+      expect(page.find(".build-link")).not_to have_content(build2.id)
+      expect(page.find(".build-link")).not_to have_content(build3.id)
+    end
+  end
+end
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
new file mode 100644
index 00000000000..d5dd11a01d3
--- /dev/null
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe "Admin Runners" do
+  before do
+    login_as :admin
+  end
+
+  describe "Runners page" do
+    before do
+      runner = FactoryGirl.create(:ci_runner)
+      commit = FactoryGirl.create(:ci_commit)
+      FactoryGirl.create(:ci_build, commit: commit, runner_id: runner.id)
+      visit admin_runners_path
+    end
+
+    it { page.has_text? "Manage Runners" }
+    it { page.has_text? "To register a new runner" }
+    it { page.has_text? "Runners with last contact less than a minute ago: 1" }
+
+    describe 'search' do
+      before do
+        FactoryGirl.create :ci_runner, description: 'runner-foo'
+        FactoryGirl.create :ci_runner, description: 'runner-bar'
+
+        search_form = find('#runners-search')
+        search_form.fill_in 'search', with: 'runner-foo'
+        search_form.click_button 'Search'
+      end
+
+      it { expect(page).to have_content("runner-foo") }
+      it { expect(page).not_to have_content("runner-bar") }
+    end
+  end
+
+  describe "Runner show page" do
+    let(:runner) { FactoryGirl.create :ci_runner }
+
+    before do
+      @project1 = FactoryGirl.create(:empty_project)
+      @project2 = FactoryGirl.create(:empty_project)
+      visit admin_runner_path(runner)
+    end
+
+    describe 'runner info' do
+      it { expect(find_field('runner_token').value).to eq runner.token }
+    end
+
+    describe 'projects' do
+      it { expect(page).to have_content(@project1.name_with_namespace) }
+      it { expect(page).to have_content(@project2.name_with_namespace) }
+    end
+
+    describe 'search' do
+      before do
+        search_form = find('#runner-projects-search')
+        search_form.fill_in 'search', with: @project1.name
+        search_form.click_button 'Search'
+      end
+
+      it { expect(page).to have_content(@project1.name_with_namespace) }
+      it { expect(page).not_to have_content(@project2.name_with_namespace) }
+    end
+  end
+
+  describe 'runners registration token' do
+    let!(:token) { current_application_settings.ensure_runners_registration_token }
+    before { visit ci_admin_runners_path }
+
+    it 'has a registration token' do
+      expect(page).to have_content("Registration token is #{token}")
+      expect(page).to have_selector('#runners-token', text: token)
+    end
+
+    describe 'reload registration token' do
+      let(:page_token) { find('#runners-token').text }
+
+      before do
+        click_button 'Reset runners registration token'
+      end
+
+      it 'changes registration token' do
+        expect(page_token).to_not eq token
+      end
+    end
+  end
+end