diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 14:25:23 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 14:25:23 +0000 |
| commit | 316630ad2c7f654024d7ea10cd5c2f978f37357e (patch) | |
| tree | 4986a2692f518bb9f4cb1e494eaf11a745317906 /spec/features/issues_spec.rb | |
| parent | aa7cef9325f1f4b9db91c28f41fad3d4bc7252f0 (diff) | |
| parent | 515a5aeb3325848de22eec6421b1a0dcaf434e2c (diff) | |
| download | gitlab-ce-316630ad2c7f654024d7ea10cd5c2f978f37357e.tar.gz | |
Merge branch 'jquery2' into 'master'
Upgraded jQuery to version 2
## What does this MR do?
Upgrades jQuery to 2.2.1.
Had to include the task_list JS file directly as it includes jQuery 1 directly https://github.com/github-archive/task_list/blob/master/app/assets/javascripts/task_list.coffee#L8 so when we change jQuery to `jquery2` it was including both jQuery 1 & 2.
## Are there points in the code the reviewer needs to double check?
For any JS errors
## What are the relevant issue numbers?
Closes #12440
See merge request !4384
Diffstat (limited to 'spec/features/issues_spec.rb')
| -rw-r--r-- | spec/features/issues_spec.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index a4eed5031c9..460d7f82b36 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -365,13 +365,9 @@ describe 'Issues', feature: true do page.within('.assignee') do expect(page).to have_content "#{@user.name}" - end - find('.block.assignee .edit-link').click - sleep 2 # wait for ajax stuff to complete - first('.dropdown-menu-user-link').click - sleep 2 - page.within('.assignee') do + click_link 'Edit' + click_link 'Unassigned' expect(page).to have_content 'No assignee' end |