summaryrefslogtreecommitdiff
path: root/spec/features/commits_spec.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-14 11:24:45 +0000
committerGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-14 12:25:37 +0100
commit32d83ee79fedc8760486ff40a2459ecb472fa51b (patch)
tree46b8032b6bcbfd1482707a9080e6538bf44faa1c /spec/features/commits_spec.rb
parentb8f67c5e4735eb25a3d03daeb95900dc87692123 (diff)
parentc81023435795766411c5954a4676ebb215af40a6 (diff)
downloadgitlab-ce-32d83ee79fedc8760486ff40a2459ecb472fa51b.tar.gz
Merge branch 'master' into ux/suppress-ci-yml-warning
* master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
Diffstat (limited to 'spec/features/commits_spec.rb')
-rw-r--r--spec/features/commits_spec.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index f48d96c35a4..ecc85376ffc 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -9,12 +9,11 @@ describe 'Commits' do
before do
login_as :user
project.team << [@user, :master]
- project.ensure_gitlab_ci_project
stub_ci_commit_to_return_yaml_file
end
let!(:commit) do
- FactoryGirl.create :ci_commit, gl_project: project, sha: project.commit.sha
+ FactoryGirl.create :ci_commit, project: project, sha: project.commit.sha
end
let!(:build) { FactoryGirl.create :ci_build, commit: commit }
@@ -89,7 +88,7 @@ describe 'Commits' do
end
describe '.gitlab-ci.yml not found warning' do
- context 'ci service enabled' 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'
@@ -102,9 +101,9 @@ describe 'Commits' do
end
end
- context 'ci service disabled' do
+ context 'ci builds disabled' do
before do
- stub_ci_service_disabled
+ stub_ci_builds_disabled
stub_ci_commit_yaml_file(nil)
visit ci_status_path(commit)
end