1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
/*
* These tests make sure that blocking/removing sites from the grid works
* as expected. Pinned tabs should not be moved. Gaps will be re-filled
* if more sites are available.
*/
gDirectorySource = "data:application/json," + JSON.stringify({
"suggested": [{
url: "http://suggested.com/",
imageURI: "data:image/png;base64,helloWORLD3",
title: "title",
type: "affiliate",
adgroup_name: "test",
frecent_sites: ["example0.com"]
}]
});
add_task(function* () {
let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
DirectoryLinksProvider.getFrecentSitesName = () => "";
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = (site) => false;
// we remove sites and expect the gaps to be filled as long as there still
// are some sites available
yield setLinks("0,1,2,3,4,5,6,7,8,9");
setPinnedLinks("");
yield* addNewTabPageTab();
yield customizeNewTabPage("enhanced"); // Toggle enhanced off
yield* checkGrid("0,1,2,3,4,5,6,7,8");
yield blockCell(4);
yield* checkGrid("0,1,2,3,5,6,7,8,9");
yield blockCell(4);
yield* checkGrid("0,1,2,3,6,7,8,9,");
yield blockCell(4);
yield* checkGrid("0,1,2,3,7,8,9,,");
// we removed a pinned site
yield restore();
yield setLinks("0,1,2,3,4,5,6,7,8");
setPinnedLinks(",1");
yield* addNewTabPageTab();
yield* checkGrid("0,1p,2,3,4,5,6,7,8");
yield blockCell(1);
yield* checkGrid("0,2,3,4,5,6,7,8,");
// we remove the last site on the grid (which is pinned) and expect the gap
// to be re-filled and the new site to be unpinned
yield restore();
yield setLinks("0,1,2,3,4,5,6,7,8,9");
setPinnedLinks(",,,,,,,,8");
yield* addNewTabPageTab();
yield* checkGrid("0,1,2,3,4,5,6,7,8p");
yield blockCell(8);
yield* checkGrid("0,1,2,3,4,5,6,7,9");
// we remove the first site on the grid with the last one pinned. all cells
// but the last one should shift to the left and a new site fades in
yield restore();
yield setLinks("0,1,2,3,4,5,6,7,8,9");
setPinnedLinks(",,,,,,,,8");
yield* addNewTabPageTab();
yield* checkGrid("0,1,2,3,4,5,6,7,8p");
yield blockCell(0);
yield* checkGrid("1,2,3,4,5,6,7,9,8p");
// Test that blocking the targeted site also removes its associated suggested tile
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
yield restore();
yield setLinks("0,1,2,3,4,5,6,7,8,9");
yield customizeNewTabPage("enhanced"); // Toggle enhanced on
yield* addNewTabPageTab();
yield* checkGrid("http://suggested.com/,0,1,2,3,4,5,6,7,8,9");
yield blockCell(1);
yield* addNewTabPageTab();
yield* checkGrid("1,2,3,4,5,6,7,8,9");
DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
});
|