diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-12 11:23:31 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-12 11:23:31 +0300 |
commit | ac50f9dddfb4555a2c356454c1cbfc1cc0b37d6d (patch) | |
tree | 39bbb7104ddbfc489fd224ccc8b9731b73f57708 /features | |
parent | 52be9e20f9e2382f01a778d7b348283e7dd757e6 (diff) |
Fix rest of rspec and spinach tests
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/shared/builds.rb | 6 | ||||
-rw-r--r-- | features/steps/shared/project.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb index c4c7672a432..cf30e23b6bd 100644 --- a/features/steps/shared/builds.rb +++ b/features/steps/shared/builds.rb @@ -10,16 +10,16 @@ module SharedBuilds end step 'project has a recent build' do - @ci_commit = create(:ci_commit, project: @project, sha: @project.commit.sha) + @ci_commit = create(:ci_commit, project: @project, sha: @project.commit.sha, ref: 'master') @build = create(:ci_build_with_coverage, commit: @ci_commit) end step 'recent build is successful' do - @build.update_column(:status, 'success') + @build.update(status: 'success') end step 'recent build failed' do - @build.update_column(:status, 'failed') + @build.update(status: 'failed') end step 'project has another build that is running' do diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 3eb0cf00e67..084338f30d8 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -230,7 +230,7 @@ module SharedProject step 'project "Shop" has CI build' do project = Project.find_by(name: "Shop") - create :ci_commit, project: project, sha: project.commit.sha, ref: 'master' + commit = create :ci_commit, project: project, sha: project.commit.sha, ref: 'master', status: 'skipped' end step 'I should see last commit with CI status' do |