Commit d9ece71e authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Fix specs

parent 9c76baf6fbe2
......@@ -12,12 +12,12 @@ def index
@builds =
case @scope
when 'all'
@all_builds
when 'finished'
@all_builds.finished
else
@all_builds.running_or_pending
when 'all'
@all_builds
when 'finished'
@all_builds.finished
else
@all_builds.running_or_pending
end
end
......
......@@ -78,7 +78,7 @@ def only_for?(project)
end
def short_sha
token[0...8]
token[0...8] if token
end
end
end
......@@ -113,7 +113,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
step 'I click status link' do
click_link "Builds"
find('.commit-ci-menu').click_link "Builds"
end
step 'I see builds list' do
......
......@@ -10,40 +10,40 @@
end
describe "GET /:project/builds" do
context "All builds" do
context "Running scope" do
before do
@build.success
@build.run!
visit namespace_project_builds_path(@gl_project.namespace, @gl_project)
end
it { expect(page).to have_content 'All builds' }
it { expect(page).to have_content 'Running' }
it { expect(page).to have_content 'Cancel all' }
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 }
it { expect(page).to_not have_content 'Cancel all' }
end
context "Pending scope" do
context "Finished scope" do
before do
@build.success
visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :pending)
@build.run!
visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :finished)
end
it { expect(page).to have_content 'No builds to show' }
it { expect(page).to_not have_content 'Cancel all' }
it { expect(page).to have_content 'Cancel all' }
end
context "Running scope" do
context "All builds" do
before do
@build.run!
visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :running)
@gl_project.ci_builds.running_or_pending.each(&:success)
visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :all)
end
it { expect(page).to have_content 'Running' }
it { expect(page).to have_content 'Cancel all' }
it { expect(page).to have_content 'All' }
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 }
it { expect(page).to_not have_content 'Cancel all' }
end
end
......@@ -53,7 +53,7 @@
visit cancel_namespace_project_build_path(@gl_project.namespace, @gl_project, @build)
end
it { expect(page).to have_content 'All builds' }
it { expect(page).to have_content 'All' }
it { expect(page).to have_content 'canceled' }
it { expect(page).to_not have_content 'Cancel all' }
end
......
......@@ -32,7 +32,7 @@
end
it 'should return the token if the description is an empty string' do
runner = FactoryGirl.build(:ci_runner, description: '')
runner = FactoryGirl.build(:ci_runner, description: '', token: 'token')
expect(runner.display_name).to eq runner.token
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment