summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-07 12:57:51 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-04-26 14:01:40 -0500
commit0392dffdb64ff70f299a1f41c6a68c202bfb8068 (patch)
treeec19fa98a7b3518437a00c7936cd8119f588a877
parent89df29e09f1ed31e9d2b0b8c1791be41641da04d (diff)
downloadgitlab-ce-0392dffdb64ff70f299a1f41c6a68c202bfb8068.tar.gz
Update wording
-rw-r--r--doc/workflow/merge_requests.md2
-rw-r--r--spec/features/merge_requests/toggle_whitespace_changes.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 3a47838e977..1b5718c91c1 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1
![MR diff](merge_requests/merge_request_diff.png)
-If you click to "Hide whitespace changes" button, you can see diff without whitespace changes.
+If you click the "Hide whitespace changes" button, you can see the diff without whitespace changes.
![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)
diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index a3c02e6c55a..cfae3fa131d 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -9,12 +9,12 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
end
- it 'should have a button to toggle whitespace changes' do
+ it 'has a button to toggle whitespace changes' do
expect(page).to have_content "Hide whitespace changes"
end
describe 'clicking "Hide whitespace changes" button' do
- it 'should hide whitespace changes' do
+ it 'toggles the "Hide whitespace changes" button' do
click_link "Hide whitespace changes"
expect(page).to have_content "Show whitespace changes"
end