diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-06-09 12:54:20 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-06-16 12:02:20 -0300 |
| commit | 2e3f0b08fbc0387d3f7985bf61c16e8ec9821750 (patch) | |
| tree | 32e5d96bbfb20ec79f5dbf5a9448ab40f0ff4a04 /spec/features/milestones | |
| parent | 673bc07c0f6cb936fbc2037440634133ad32afaf (diff) | |
| download | gitlab-ce-2e3f0b08fbc0387d3f7985bf61c16e8ec9821750.tar.gz | |
Remove old specs and add new ones
Diffstat (limited to 'spec/features/milestones')
| -rw-r--r-- | spec/features/milestones/milestones_spec.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/features/milestones/milestones_spec.rb b/spec/features/milestones/milestones_spec.rb index 1537b0f472a..9e117c8ed9f 100644 --- a/spec/features/milestones/milestones_spec.rb +++ b/spec/features/milestones/milestones_spec.rb @@ -39,7 +39,6 @@ # expect(issue_target).to have_selector('.issuable-row') # end # end ->>>>>>> Remove Drag and drop and sorting from milestone view # context 'merge requests' do # let(:merge_request) { page.find_by_id('merge_requests-list-unassigned').find('li') } @@ -73,13 +72,8 @@ # end # end -<<<<<<< 5f42009f8dcc29d559ee415e92c88858e361f063 - def create_and_drag_issue(params = {}) - @issue = create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone)) -======= # def create_and_drag_issue(params = {}) # create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone)) ->>>>>>> Remove Drag and drop and sorting from milestone view # visit namespace_project_milestone_path(project.namespace, project, milestone) # scroll_into_view('.milestone-content') |