summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-21 08:52:37 +0100
committerPhil Hughes <me@iamphill.com>2016-07-21 08:52:37 +0100
commita6e312bf1dd01aa653761c5bf1e848df9707c0cb (patch)
tree0689110ba989fecf1b0649c56ef39471b90725c7
parent48a360f21a92bd6e74b5c7c9e7fe9ed34e912652 (diff)
downloadgitlab-ce-a6e312bf1dd01aa653761c5bf1e848df9707c0cb.tar.gz
Updated wording in the specs
-rw-r--r--spec/features/issues/form_spec.rb4
-rw-r--r--spec/features/merge_requests/form_spec.rb8
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 2d0dae6f150..8771cc8e157 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -18,7 +18,7 @@ describe 'New/edit issue', feature: true, js: true do
visit new_namespace_project_issue_path(project.namespace, project)
end
- it 'should allow user to create new issue' do
+ it 'allows user to create new issue' do
fill_in 'issue_title', with: 'title'
fill_in 'issue_description', with: 'title'
@@ -75,7 +75,7 @@ describe 'New/edit issue', feature: true, js: true do
visit edit_namespace_project_issue_path(project.namespace, project, issue)
end
- it 'should allow user to update issue' do
+ it 'allows user to update issue' do
expect(find('input[name="issue[assignee_id]"]', visible: false).value).to match(user.id.to_s)
expect(find('input[name="issue[milestone_id]"]', visible: false).value).to match(milestone.id.to_s)
diff --git a/spec/features/merge_requests/form_spec.rb b/spec/features/merge_requests/form_spec.rb
index b9591644cd2..7594cbf54e8 100644
--- a/spec/features/merge_requests/form_spec.rb
+++ b/spec/features/merge_requests/form_spec.rb
@@ -16,7 +16,7 @@ describe 'New/edit merge request', feature: true, js: true do
before do
login_as(user)
end
-
+
context 'new merge request' do
before do
visit new_namespace_project_merge_request_path(
@@ -30,7 +30,7 @@ describe 'New/edit merge request', feature: true, js: true do
})
end
- it 'should create new merge request' do
+ it 'creates new merge request' do
click_button 'Assignee'
page.within '.dropdown-menu-user' do
click_link user.name
@@ -91,7 +91,7 @@ describe 'New/edit merge request', feature: true, js: true do
visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
end
- it 'should update merge request' do
+ it 'updates merge request' do
click_button 'Assignee'
page.within '.dropdown-menu-user' do
click_link user.name
@@ -160,7 +160,7 @@ describe 'New/edit merge request', feature: true, js: true do
})
end
- it 'should create new merge request' do
+ it 'creates new merge request' do
click_button 'Assignee'
page.within '.dropdown-menu-user' do
click_link user.name