nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-08-29 17:01:14 +02:00
commit 1dee542933
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -270,7 +270,7 @@ group :test do
gem "capybara", "2.4.4" gem "capybara", "2.4.4"
gem "database_cleaner" , "1.4.1" gem "database_cleaner" , "1.4.1"
gem "selenium-webdriver", "2.46.2" gem "selenium-webdriver", "2.47.1"
# General helpers # General helpers

4
Gemfile.lock
View file

@ -679,7 +679,7 @@ GEM
sawyer (0.6.0) sawyer (0.6.0)
addressable (~> 2.3.5) addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10) faraday (~> 0.8, < 0.10)
selenium-webdriver (2.46.2) selenium-webdriver (2.47.1)
childprocess (~> 0.5) childprocess (~> 0.5)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip (~> 1.0) rubyzip (~> 1.0)
@ -897,7 +897,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.14) ruby-oembed (= 0.8.14)
rubyzip (= 1.1.7) rubyzip (= 1.1.7)
sass-rails (= 5.0.1) sass-rails (= 5.0.1)
selenium-webdriver (= 2.46.2) selenium-webdriver (= 2.47.1)
shoulda-matchers (= 2.8.0) shoulda-matchers (= 2.8.0)
sidekiq (= 3.4.2) sidekiq (= 3.4.2)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)

9
features/step_definitions/aspects_steps.rb
View file

@ -93,7 +93,14 @@ When /^I drag "([^"]*)" (up|down)$/ do |aspect_name, direction|
aspect = find(:xpath, "//div[@id='aspect_nav']/ul/a[@data-aspect-id='#{aspect_id}']") aspect = find(:xpath, "//div[@id='aspect_nav']/ul/a[@data-aspect-id='#{aspect_id}']")
target = direction == "up" ? aspect.all(:xpath, "./preceding-sibling::a").last : target = direction == "up" ? aspect.all(:xpath, "./preceding-sibling::a").last :
aspect.all(:xpath, "./following-sibling::a").first aspect.all(:xpath, "./following-sibling::a").first
aspect.drag_to(target) browser = aspect.base.driver.browser
mouse = browser.mouse
native_aspect = aspect.base.native
native_target = target.base.native
mouse.down native_aspect
mouse.move_to native_target, native_target.size.width / 2, 0
sleep 1
mouse.up
expect(page).to have_no_css "#aspect_nav .ui-sortable.syncing" expect(page).to have_no_css "#aspect_nav .ui-sortable.syncing"
end end