diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 22:22:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 22:22:16 +0300 |
| commit | 8618277f24e9adeef28fe93dc23b39f7a5357c52 (patch) | |
| tree | d2c4cb59a2b58bfec3a66906fb677cbdfa4af93d /spec | |
| parent | 9e5f4aec6c86848bd4fa9dbd98d109036d472e30 (diff) | |
| parent | 97d4ac40477788c1c43d2f32baefd1df1ceeb9f4 (diff) | |
Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links
Conflicts:
CHANGELOG
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/issues_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index 26607b0090c..e6fa376f3eb 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -65,7 +65,7 @@ describe "Issues", feature: true do click_button "Save changes" - page.should have_content "Assignee: Select assignee" + page.should have_content 'Assignee: none' issue.reload.assignee.should be_nil end end @@ -249,6 +249,7 @@ describe "Issues", feature: true do click_button 'Update Issue' page.should have_content "Milestone changed to #{milestone.title}" + page.should have_content "Milestone: #{milestone.title}" has_select?('issue_assignee_id', :selected => milestone.title) end end @@ -287,7 +288,7 @@ describe "Issues", feature: true do sleep 2 # wait for ajax stuff to complete first('.user-result').click - page.should have_content "Assignee: Unassigned" + page.should have_content 'Assignee: none' sleep 2 # wait for ajax stuff to complete issue.reload.assignee.should be_nil end |