1
=== modified file 'Dash/GenericScopeView.qml'
2
--- Dash/GenericScopeView.qml	2013-09-19 15:28:42 +0000
3
+++ Dash/GenericScopeView.qml	2013-09-26 12:00:21 +0000
4
@@ -50,6 +50,12 @@
5
50
        }
50
        }
6
51
    }
51
    }
7
52
52
8
53
    Connections {
9
54
        target: scopeView.scope
10
55
        onShowDash: previewLoader.open = false;
11
56
        onHideDash: previewLoader.open = false;
12
57
    }
13
58
14
53
    ScopeListView {
59
    ScopeListView {
15
54
        id: categoryView
60
        id: categoryView
16
55
        anchors.fill: parent
61
        anchors.fill: parent
17
56
62
18
=== modified file 'tests/mocks/Unity/fake_scope.h'
19
--- tests/mocks/Unity/fake_scope.h	2013-09-02 20:34:05 +0000
20
+++ tests/mocks/Unity/fake_scope.h	2013-09-26 12:00:21 +0000
21
@@ -90,6 +90,8 @@
22
90
    // signals triggered by activate(..) or preview(..) requests.
90
    // signals triggered by activate(..) or preview(..) requests.
23
91
    void previewReady(Preview *preview);
91
    void previewReady(Preview *preview);
24
92
    void activateApplication(const QString &desktop);
92
    void activateApplication(const QString &desktop);
25
93
    void showDash();
26
94
    void hideDash();
27
93
95
28
94
protected:
96
protected:
29
95
97
30
96
98
31
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
32
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-17 16:40:27 +0000
33
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-26 12:00:21 +0000
34
@@ -52,6 +52,20 @@
35
52
                tryCompare(pageHeader, "searchQuery", "")
52
                tryCompare(pageHeader, "searchQuery", "")
36
53
                tryCompare(genericScopeView, "previewShown", false);
53
                tryCompare(genericScopeView, "previewShown", false);
37
54
            }
54
            }
38
55
39
56
            function test_showDash() {
40
57
                var previewLoader = findChild(genericScopeView, "previewLoader");
41
58
                previewLoader.open = true;
42
59
                scopes.get(0).showDash();
43
60
                tryCompare(genericScopeView, "previewShown", false);
44
61
            }
45
62
46
63
            function test_hideDash() {
47
64
                var previewLoader = findChild(genericScopeView, "previewLoader");
48
65
                previewLoader.open = true;
49
66
                scopes.get(0).hideDash();
50
67
                tryCompare(genericScopeView, "previewShown", false);
51
68
            }
52
55
        }
69
        }
53
56
    }
70
    }
54
57
}
71
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-26
Michał Sawicz			Approve on 2013-09-26
Diego Sarmentero (community)		2013-09-26	Approve on 2013-09-26
Review via email: mp+187741@code.launchpad.net
1	=== modified file 'Dash/GenericScopeView.qml'
2	--- Dash/GenericScopeView.qml 2013-09-19 15:28:42 +0000
3	+++ Dash/GenericScopeView.qml 2013-09-26 12:00:21 +0000
4	@@ -50,6 +50,12 @@
5	50	}	50	}
6	51	}	51	}
7	52		52
8			53	Connections {
9			54	target: scopeView.scope
10			55	onShowDash: previewLoader.open = false;
11			56	onHideDash: previewLoader.open = false;
12			57	}
13			58
14	53	ScopeListView {	59	ScopeListView {
15	54	id: categoryView	60	id: categoryView
16	55	anchors.fill: parent	61	anchors.fill: parent
17	56		62
18	=== modified file 'tests/mocks/Unity/fake_scope.h'
19	--- tests/mocks/Unity/fake_scope.h 2013-09-02 20:34:05 +0000
20	+++ tests/mocks/Unity/fake_scope.h 2013-09-26 12:00:21 +0000
21	@@ -90,6 +90,8 @@
22	90	// signals triggered by activate(..) or preview(..) requests.	90	// signals triggered by activate(..) or preview(..) requests.
23	91	void previewReady(Preview *preview);	91	void previewReady(Preview *preview);
24	92	void activateApplication(const QString &desktop);	92	void activateApplication(const QString &desktop);
25			93	void showDash();
26			94	void hideDash();
27	93		95
28	94	protected:	96	protected:
29	95		97
30	96		98
31	=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
32	--- tests/qmltests/Dash/tst_GenericScopeView.qml 2013-09-17 16:40:27 +0000
33	+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2013-09-26 12:00:21 +0000
34	@@ -52,6 +52,20 @@
35	52	tryCompare(pageHeader, "searchQuery", "")	52	tryCompare(pageHeader, "searchQuery", "")
36	53	tryCompare(genericScopeView, "previewShown", false);	53	tryCompare(genericScopeView, "previewShown", false);
37	54	}	54	}
38			55
39			56	function test_showDash() {
40			57	var previewLoader = findChild(genericScopeView, "previewLoader");
41			58	previewLoader.open = true;
42			59	scopes.get(0).showDash();
43			60	tryCompare(genericScopeView, "previewShown", false);
44			61	}
45			62
46			63	function test_hideDash() {
47			64	var previewLoader = findChild(genericScopeView, "previewLoader");
48			65	previewLoader.open = true;
49			66	scopes.get(0).hideDash();
50			67	tryCompare(genericScopeView, "previewShown", false);
51			68	}
52	55	}	69	}
53	56	}	70	}
54	57	}	71	}