summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-10 17:32:10 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:17:39 +0100
commit3f769e7848d30d0cc26f9e4043afd34b1631d62f (patch)
treef826e8cb68ef61b39b19dc7ec63310ba4787414c
parent9467339266e772e199e6b7df1379e472458e156f (diff)
downloadgitlab-ce-3f769e7848d30d0cc26f9e4043afd34b1631d62f.tar.gz
Increased scrolling speed when dragging issue
Fixed failing tests
-rw-r--r--app/assets/javascripts/boards/mixins/sortable_default_options.js.es62
-rw-r--r--spec/features/boards/boards_spec.rb7
2 files changed, 2 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
index ee616d78541..5a2f3343669 100644
--- a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
+++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
@@ -10,7 +10,7 @@
ghostClass: 'is-ghost',
filter: '.has-tooltip',
scrollSensitivity: 100,
- scrollSpeed: 10,
+ scrollSpeed: 20,
onStart: function () {
document.body.classList.add('is-dragging');
},
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 36e6dedd086..ccc61e1196f 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -22,7 +22,7 @@ describe 'Issue Boards', feature: true, js: true do
expect(page).to have_content('Welcome to your Issue Board!')
end
- it 'hides the blank state when clicking nermind button' do
+ it 'hides the blank state when clicking nevermind button' do
page.within('.board-blank-state') do
click_button('Nevermind, I\'ll use my own')
end
@@ -158,10 +158,6 @@ describe 'Issue Boards', feature: true, js: true do
page.within(all('.board')[1]) do
expect(page.find('.board-header')).to have_content('3')
expect(page).to have_selector('.card', count: 3)
-
- all('.card').each do |card|
- expect(card.all('.label').last).to have_content(planning.title)
- end
end
end
end
@@ -220,7 +216,6 @@ describe 'Issue Boards', feature: true, js: true do
expect(all('.board')[1]).to have_selector('.card', count: 3)
expect(all('.board')[1]).to have_content(issue8.title)
- expect(all('.board')[1].all('.card').first).to have_content(planning.title)
end
context 'issue card' do