diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-26 17:10:44 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 22:05:15 +0300 |
| commit | 571f07dc074543b079385d18ec94404a365be0a9 (patch) | |
| tree | 4013c9c9b1e385fec0d7245df0a3bdf7b403835e /spec/features | |
| parent | 42fac10d77f7b5a7dbad2febf1e1b7d5e95ab407 (diff) | |
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame"
See merge request !12401
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/blobs/blob_line_permalink_updater_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/files/browse_files_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb index 53c5a52ce3a..d94204230f6 100644 --- a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb +++ b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb @@ -55,7 +55,7 @@ feature 'Blob button line permalinks (BlobLinePermalinkUpdater)', feature: true, end end - describe 'Click "Annotate" button' do + describe 'Click "Blame" button' do it 'works with no initial line number fragment hash' do visit_blob diff --git a/spec/features/projects/files/browse_files_spec.rb b/spec/features/projects/files/browse_files_spec.rb index 30a1eedbb48..c0a9327249c 100644 --- a/spec/features/projects/files/browse_files_spec.rb +++ b/spec/features/projects/files/browse_files_spec.rb @@ -12,7 +12,7 @@ feature 'user browses project', feature: true, js: true do scenario "can see blame of '.gitignore'" do click_link ".gitignore" - click_link 'Annotate' + click_link 'Blame' expect(page).to have_content "*.rb" expect(page).to have_content "Dmitriy Zaporozhets" |