diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
| commit | ad68bc63b5e7e8080e82d9febec05397c802d33d (patch) | |
| tree | d9508d5bd96c8087d13b88051637bb442e877659 /features/steps/shared/project.rb | |
| parent | 41c06c311b9c5642f6056d0b34030980ebf507b3 (diff) | |
| parent | cc322603945816ed957da7c0efa56e2ef1016569 (diff) | |
| download | gitlab-ce-ad68bc63b5e7e8080e82d9febec05397c802d33d.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# app/models/project.rb
# db/schema.rb
# lib/gitlab/import_export/import_export_reader.rb
Diffstat (limited to 'features/steps/shared/project.rb')
| -rw-r--r-- | features/steps/shared/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index ea5f9580308..b3411c03118 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -95,7 +95,7 @@ module SharedProject step 'I should see project settings' do expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project) expect(page).to have_content("Project name") - expect(page).to have_content("Features:") + expect(page).to have_content("Features") end def current_project @@ -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', status: 'skipped' + create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master', status: 'skipped' end step 'I should see last commit with CI status' do |