summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-26 14:10:44 +0000
committerRémy Coutable <remy@rymai.me>2017-06-26 14:10:44 +0000
commitdfc85426493fdd9848e4f321e436d439608682cc (patch)
treea95896e039f35d0d0aea7687ffce92859acf463d /spec
parent47face017562b160dba2c9bb5d7b9e75f605f721 (diff)
parent516a3b788078b9296a86bfa6b8d3160ea742f851 (diff)
downloadgitlab-ce-dfc85426493fdd9848e4f321e436d439608682cc.tar.gz
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame" See merge request !12401
Diffstat (limited to 'spec')
-rw-r--r--spec/features/projects/blobs/blob_line_permalink_updater_spec.rb2
-rw-r--r--spec/features/projects/files/browse_files_spec.rb2
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 2a82c3ac179..34aef958ec6 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"