summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-12 16:20:58 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-12 16:20:58 -0700
commit80b2f3fb86d6e6b16565b9e9de82dda169926bcb (patch)
tree75dab16b2591d00f97d22466c9ba705908f69c61 /features
parent0f144f36bc5703ba745a8a6d1cde14fb694c4e34 (diff)
downloadgitlab-ce-80b2f3fb86d6e6b16565b9e9de82dda169926bcb.tar.gz
Implement merge requests search
It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
Diffstat (limited to 'features')
-rw-r--r--features/project/merge_requests.feature7
-rw-r--r--features/steps/project/merge_requests.rb4
2 files changed, 11 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 7c029f05d75..adad100e56c 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -218,3 +218,10 @@ Feature: Project Merge Requests
And I click link "Edit" for the merge request
And I preview a description text like "Bug fixed :smile:"
Then I should see the Markdown write tab
+
+ @javascript
+ Scenario: I search merge request
+ Given I click link "All"
+ When I fill in merge request search with "Fe"
+ Then I should see "Feature NS-03" in merge requests
+ And I should not see "Bug NS-04" in merge requests
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 263f2ef2438..b67b2e58caf 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -276,6 +276,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
+ step 'I fill in merge request search with "Fe"' do
+ fill_in 'issue_search', with: "Fe"
+ end
+
def merge_request
@merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
end