summaryrefslogtreecommitdiff
path: root/spec/finders
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-25 13:36:28 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-27 14:22:11 +0200
commit45e4727f97034f719b4fb2a061fd626f545db968 (patch)
tree74258b2172cf532b0505a666d29eba4ab7c4b2c3 /spec/finders
parent106cb511de8259bb57da65294b6e4fbba9146b80 (diff)
downloadgitlab-ce-45e4727f97034f719b4fb2a061fd626f545db968.tar.gz
Set milestone on new issue when creating issue from index with milestone filter active.
Diffstat (limited to 'spec/finders')
-rw-r--r--spec/finders/issues_finder_spec.rb16
-rw-r--r--spec/finders/merge_requests_finder_spec.rb4
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 69bac387d20..db20b23f87d 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -26,37 +26,37 @@ describe IssuesFinder do
context 'scope: all' do
it 'should filter by all' do
params = { scope: "all", state: 'opened' }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues.size).to eq(3)
end
it 'should filter by assignee id' do
params = { scope: "all", assignee_id: user.id, state: 'opened' }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues.size).to eq(2)
end
it 'should filter by author id' do
params = { scope: "all", author_id: user2.id, state: 'opened' }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues).to eq([issue3])
end
it 'should filter by milestone id' do
params = { scope: "all", milestone_title: milestone.title, state: 'opened' }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues).to eq([issue1])
end
it 'should be empty for unauthorized user' do
params = { scope: "all", state: 'opened' }
- issues = IssuesFinder.new.execute(nil, params)
+ issues = IssuesFinder.new(nil, params).execute
expect(issues.size).to be_zero
end
it 'should not include unauthorized issues' do
params = { scope: "all", state: 'opened' }
- issues = IssuesFinder.new.execute(user2, params)
+ issues = IssuesFinder.new(user2, params).execute
expect(issues.size).to eq(2)
expect(issues).not_to include(issue1)
expect(issues).to include(issue2)
@@ -67,13 +67,13 @@ describe IssuesFinder do
context 'personal scope' do
it 'should filter by assignee' do
params = { scope: "assigned-to-me", state: 'opened' }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues.size).to eq(2)
end
it 'should filter by project' do
params = { scope: "assigned-to-me", state: 'opened', project_id: project1.id }
- issues = IssuesFinder.new.execute(user, params)
+ issues = IssuesFinder.new(user, params).execute
expect(issues.size).to eq(1)
end
end
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index 8536377a7f0..bc385fd0d69 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -20,13 +20,13 @@ describe MergeRequestsFinder do
describe "#execute" do
it 'should filter by scope' do
params = { scope: 'authored', state: 'opened' }
- merge_requests = MergeRequestsFinder.new.execute(user, params)
+ merge_requests = MergeRequestsFinder.new(user, params).execute
expect(merge_requests.size).to eq(2)
end
it 'should filter by project' do
params = { project_id: project1.id, scope: 'authored', state: 'opened' }
- merge_requests = MergeRequestsFinder.new.execute(user, params)
+ merge_requests = MergeRequestsFinder.new(user, params).execute
expect(merge_requests.size).to eq(1)
end
end