summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-09-02 14:00:57 +0100
committerPhil Hughes <me@iamphill.com>2016-09-02 14:00:57 +0100
commit69db604e55de2bdf1a28c274be6cc9131534517d (patch)
treec84a624f8f6a5f66a470b486c5534c8d2b046d00
parentd2e2da4cb474bdd713eae71df3da644856ce4b81 (diff)
downloadgitlab-ce-69db604e55de2bdf1a28c274be6cc9131534517d.tar.gz
Updated tests
-rw-r--r--spec/features/issues/filter_issues_spec.rb1
-rw-r--r--spec/views/projects/merge_requests/edit.html.haml_spec.rb5
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 372ad39676d..24e5491f087 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -110,7 +110,6 @@ describe 'Filter issues', feature: true do
end
it 'filters by wont fix labels' do
- find('.dropdown-menu-labels a', text: label.title).click
page.within '.labels-filter' do
expect(page).to have_content wontfix.title
click_link wontfix.title
diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
index 31bbb150698..9da05e1721c 100644
--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
@@ -7,12 +7,15 @@ describe 'projects/merge_requests/edit.html.haml' do
let(:project) { create(:project) }
let(:fork_project) { create(:project, forked_from_project: project) }
let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }
+ let(:milestone) { create(:milestone, project: project) }
let(:closed_merge_request) do
create(:closed_merge_request,
source_project: fork_project,
target_project: project,
- author: user)
+ author: user,
+ assignee: user,
+ milestone: milestone)
end
before do