@@ -570,53 +570,43 @@ Item {
570570 genericScopeView.scope = !genericScopeView.scope;
571571 }
572572
573− function test_pullToRefresh() {
574− waitForRendering(genericScopeView)
575−
576− mouseFlick(genericScopeView,
577− genericScopeView.width/2, units.gu(10),
578− genericScopeView.width/2, units.gu(80),
579− true, false)
580−
581− var pullToRefresh = findChild(genericScopeView, "pullToRefresh")
582− tryCompare(pullToRefresh, "releaseToRefresh", true)
573+ function test_pullToRefresh_data() {
574+ return [
575+ { tag: "Tall window long swipe", shellHeight: units.gu(100), swipeLength: units.gu(70), refresh: true },
576+ { tag: "Tall window short swipe", shellHeight: units.gu(100), swipeLength: units.gu(25), refresh: false },
577+ { tag: "Short window", shellHeight: units.gu(30), swipeLength: units.gu(25), refresh: true }
578+ ];
579+ }
583580
584− spy.target = genericScopeView.scope
585− spy.signalName = "refreshed"
581+ function test_pullToRefresh(data) {
582+ var initialHeight = shell.height;
583+ shell.height = data.shellHeight;
584+ waitForRendering(shell);
586585
587− mouseRelease(genericScopeView)
588− tryCompare(pullToRefresh, "releaseToRefresh", false)
586+ waitForRendering(genericScopeView);
589587
590− spy.wait()
591− compare(spy.count, 1)
588+ var pullToRefresh = findChild(genericScopeView, "pullToRefresh");
592589
593− // test short swipe doesn't refresh on tall window
594− mouseFlick(genericScopeView,
595− genericScopeView.width/2, units.gu(10),
596− genericScopeView.width/2, units.gu(20),
597− true, false)
598− mouseRelease(genericScopeView)
599− compare(spy.count, 1)
600−
601− // resize window, repeat the test
602− var initialHeight = shell.height
603− shell.height = units.gu(30)
604− waitForRendering(shell)
605590 mouseFlick(genericScopeView,
606− genericScopeView.width/2, units.gu(10),
607− genericScopeView.width/2, units.gu(20),
608− true, false)
591+ genericScopeView.width/2, units.gu(6),
592+ genericScopeView.width/2, units.gu(6) + data.swipeLength,
593+ true, false);
609594
610− tryCompare(pullToRefresh, "releaseToRefresh", true)
595+ tryCompare(pullToRefresh, "releaseToRefresh", data.refresh);
596+
597+ spy.target = genericScopeView.scope;
598+ spy.signalName = "refreshed";
611599
612− mouseRelease(genericScopeView)
613− tryCompare(pullToRefresh, "releaseToRefresh", false)
600+ mouseRelease(genericScopeView);
601+ tryCompare(pullToRefresh, "releaseToRefresh", false);
614602
615− spy.wait()
616− compare(spy.count, 2)
603+ if (data.refresh) {
604+ spy.wait();
605+ compare(spy.count, 1);
606+ }
617607
618− shell.height = initialHeight
619− waitForRendering(shell)
608+ shell.height = initialHeight;
609+ waitForRendering(shell);
620610 }
621611
622612 function test_item_noninteractive() {