Merge into trunk : unfavorite_scope

Status:	Merged
Approved by:	Michael Zanetti on 2015-11-25
Approved revision:	2042
Merged at revision:	2083
Proposed branch:	lp:~aacid/unity8/unfavorite_scope_test
Merge into:	lp:unity8
Diff against target:	52 lines (+21/-0) 3 files modified tests/mocks/Unity/fake_scopes.cpp (+3/-0) tests/qmltests/Dash/tst_DashContent.qml (+13/-0) tests/qmltests/Dash/tst_GenericScopeView.qml (+5/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/unfavorite_scope_test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2015-11-10	Approve on 2015-11-25
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-24
Review via email: mp+277157@code.launchpad.net

Commit Message

Make sure that unfavoriting a scope gives us the next one

This is currently broken due to a regression in the Qt Quick ListView

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

PS Jenkins bot (ps-jenkins) wrote on 2015-11-10:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6696/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/unfavorite_scope_test updated on 2015-11-11

2039. By Albert Astals Cid on 2015-11-11

Make sure that unfavoriting a scope gives us the next one

This is currently broken due to a regression in the Qt Quick ListView

2040. By Albert Astals Cid on 2015-11-11

Start from a clean scopes situation every test now that favorite changes scopes

PS Jenkins bot (ps-jenkins) wrote on 2015-11-11:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6698/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/unfavorite_scope_test updated on 2015-11-24

2041. By Albert Astals Cid on 2015-11-24: Merge
2042. By Albert Astals Cid on 2015-11-24: Remove the expectFail since the fix for the bug has landed

PS Jenkins bot (ps-jenkins) wrote on 2015-11-24:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6792/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-11-25:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?

yes

* Did CI run pass? If not, please explain why.

yes (v+o at least)

* Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

 === modified file 'tests/mocks/Unity/fake_scopes.cpp'
 --- tests/mocks/Unity/fake_scopes.cpp	2015-08-19 13:56:21 +0000
 +++ tests/mocks/Unity/fake_scopes.cpp	2015-11-24 09:19:18 +0000
@@ -260,6 +260,9 @@
          beginInsertRows(QModelIndex(), index, index);
          m_scopes.append(scope);
          endInsertRows();
++        connect(scope, &Scope::favoriteChanged, [this, scope]{
++            setFavorite(scope->id(), scope->favorite());
++        });
+     }
      m_allScopes.append(scope);
+ }
 === modified file 'tests/qmltests/Dash/tst_DashContent.qml'
 --- tests/qmltests/Dash/tst_DashContent.qml	2015-09-18 07:43:38 +0000
 +++ tests/qmltests/Dash/tst_DashContent.qml	2015-11-24 09:19:18 +0000
@@ -599,5 +599,18 @@
              expectFail("", "There has to be new cards after releasing the list is not moving anymore");
              verify(compareArrays(buttons3, buttons));
+         }
++
++        function test_unfavoriteScope()
++        {
++            var dashContentList = findChild(dashContent, "dashContentList");
++            var header = findChild(dashContentList.currentItem, "scopePageHeader")
++            var favoriteAction = findChild(header, "favorite_action_button");
++            compare(dashContentList.currentIndex, 0);
++            compare(dashContentList.indexAt(dashContentList.width * 1.5, 0), 1);
++            var nextScopeId = dashContentList.itemAt(dashContentList.width * 1.5, 0).item.scope.id;
++            mouseClick(favoriteAction);
++            tryCompareFunction(function() { return dashContentList.currentItem.item.scope.id == nextScopeId; }, true);
++            compare(dashContentList.currentIndex, 0);
++        }
+     }
+ }
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-08-03 13:48:14 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-11-24 09:19:18 +0000
@@ -70,6 +70,11 @@
              property Item header: findChild(genericScopeView, "scopePageHeader")
              function init() {
++                // Start from a clean scopes situation every test
++                scopes.clear();
++                scopes.load();
++                tryCompare(scopes, "loaded", true);
++
                  genericScopeView.scope = scopes.getScope(2);
                  shell.width = units.gu(120);
                  genericScopeView.categoryView.positionAtBeginning();

Unity 8

Merge lp:~aacid/unity8/unfavorite_scope_test into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers