From c220f9a03717ea2274a61f3365d37b5bac5c24e7 Mon Sep 17 00:00:00 2001
From: Katarzyna Kobierska <kkobierska@gmail.com>
Date: Tue, 12 Jul 2016 10:31:15 +0200
Subject: [PATCH] Add tests to project builds for pending tab
Fix CHANGELOG
Fix build spec for pending tab
---
CHANGELOG | 6 +-----
spec/features/builds_spec.rb | 12 ++++++++++++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6cfb51b5d62..38aee5af6c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -113,6 +113,7 @@ v 8.9.6
- Fix broken migration in MySQL. !5005
- Overwrite Host and X-Forwarded-Host headers in NGINX !5213
- Keeps issue number when importing from Gitlab.com
+ - Add Pending tab for Builds (Katarzyna Kobierska, Urszula Budziszewska)
v 8.9.7 (unreleased)
- Fix import_data wrongly saved as a result of an invalid import_url
@@ -133,11 +134,6 @@ v 8.9.5
- Fixed 'use shortcuts' button on docs. !4979
- Admin should be able to turn shared runners into specific ones. !4961
- Update RedCloth to 4.3.2 for CVE-2012-6684. !4929 (Takuya Noguchi)
- - Add Pending tab for Builds
-
-v 8.9.4 (unreleased)
- - Ensure references to private repos aren't shown to logged-out users
-v 8.9.5 (unreleased)
- Improve the request / withdraw access button. !4860
v 8.9.4
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 16832c297ac..38c11ca9c4c 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -13,6 +13,18 @@ describe "Builds" do
end
describe "GET /:project/builds" do
+ context "Pending scope" do
+ before do
+ visit namespace_project_builds_path(@project.namespace, @project, scope: :pending)
+ end
+
+ it { expect(page).to have_link 'Cancel running' }
+ it { expect(page).to have_selector('.nav-links li.active', text: 'Pending') }
+ it { expect(page).to have_content @build.short_sha }
+ it { expect(page).to have_content @build.ref }
+ it { expect(page).to have_content @build.name }
+ end
+
context "Running scope" do
before do
@build.run!
--
GitLab