diff options
author | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
commit | e83fc684a583140ce30644a7062f8470880fdf43 (patch) | |
tree | 6c2a2f52da54d58def135757fcb5f14db8dd8a20 /spec/features/projects/badges/list_spec.rb | |
parent | f70c000924c82bc579310fe784a6df159d15618b (diff) | |
parent | 6f0c503397e184d2a68eec8d4285288abc29ce9a (diff) | |
download | gitlab-ce-e83fc684a583140ce30644a7062f8470880fdf43.tar.gz |
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
# Gemfile.lock
# app/helpers/todos_helper.rb
# app/models/todo.rb
# app/views/projects/edit.html.haml
# lib/gitlab/import_export/import_service.rb
Diffstat (limited to 'spec/features/projects/badges/list_spec.rb')
-rw-r--r-- | spec/features/projects/badges/list_spec.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb index 13c9b95b316..51be81d634c 100644 --- a/spec/features/projects/badges/list_spec.rb +++ b/spec/features/projects/badges/list_spec.rb @@ -8,12 +8,10 @@ feature 'list of badges' do project = create(:project) project.team << [user, :master] login_as(user) - visit edit_namespace_project_path(project.namespace, project) + visit namespace_project_badges_path(project.namespace, project) end scenario 'user displays list of badges' do - click_link 'Badges' - expect(page).to have_content 'build status' expect(page).to have_content 'Markdown' expect(page).to have_content 'HTML' @@ -26,7 +24,6 @@ feature 'list of badges' do end scenario 'user changes current ref on badges list page', js: true do - click_link 'Badges' select2('improve/awesome', from: '#ref') expect(page).to have_content 'badges/improve/awesome/build.svg' |