summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-19 10:35:24 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-19 10:35:24 +0200
commitededfd2d29bea4fff7c69634dc813c274eb346ee (patch)
tree652a0e9f17635b218fbbc438e7235fa812d06541 /spec
parentee750298675f0beed94688a9798d3e0b8362b455 (diff)
downloadgitlab-ce-ededfd2d29bea4fff7c69634dc813c274eb346ee.tar.gz
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/features/issues_spec.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 834ed73549b..ffe6d02d2f2 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -186,7 +186,7 @@ describe "Issues" do
find('.edit-issue.inline-update #issue_assignee_id').set project.team.members.first.id
click_button 'Update Issue'
- page.should have_content "currently assigned to"
+ page.should have_content "Assignee:"
page.has_select?('issue_assignee_id', :selected => project.team.members.first.name)
end
end
@@ -206,11 +206,9 @@ describe "Issues" do
login_with guest
visit project_issue_path(project, issue)
- page.should have_content "currently assigned to #{issue.assignee.name}"
-
+ page.should have_content issue.assignee.name
end
end
-
end
describe 'update milestone from issue#show' do
@@ -225,17 +223,16 @@ describe "Issues" do
find('.edit-issue.inline-update').select(milestone.title, from: 'issue_milestone_id')
click_button 'Update Issue'
- page.should have_content "Attached to milestone"
+ page.should have_content "Milestone"
page.has_select?('issue_assignee_id', :selected => milestone.title)
end
end
context 'by unauthorized user' do
-
let(:guest) { create(:user) }
before :each do
- project.team << [[guest], :guest]
+ project.team << [guest, :guest]
issue.milestone = milestone
issue.save
end
@@ -245,8 +242,7 @@ describe "Issues" do
login_with guest
visit project_issue_path(project, issue)
-
- page.should have_content "Attached to milestone #{milestone.title}"
+ page.should have_content milestone.title
end
end
end
@@ -258,4 +254,4 @@ describe "Issues" do
def last_issue
all("ul.issues-list li").last.text
end
-end \ No newline at end of file
+end