Renato Araujo Oliveira Filho has proposed merging
lp:~renatofilho/ubuntu-calendar-app/fix-unit-tests into lp:ubuntu-calendar-app.
Requested reviews:
Ubuntu Calendar Developers (ubuntu-calendar-dev)
For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/fix-unit-tests/+merge/298446
--
Your team Ubuntu Calendar Developers is requested to review the proposed merge
of lp:~renatofilho/ubuntu-calendar-app/fix-unit-tests into
lp:ubuntu-calendar-app.
=== modified file 'debian/control'
--- debian/control 2014-09-19 11:35:21 +0000
+++ debian/control 2016-06-27 16:52:35 +0000
@@ -5,10 +5,12 @@
debhelper (>= 9),
intltool,
python3,
+ qml-module-qtorganizer,
+ qml-module-qtquick2,
+ qml-module-qttest,
+ qt5-default,
qtdeclarative5-dev-tools,
- qt5-default,
- qtdeclarative5-qtquick2-plugin,
- qtdeclarative5-test-plugin,
+ qtdeclarative5-ubuntu-content1,
Standards-Version: 3.9.4
Section: misc
Homepage: https://launchpad.net/ubuntu-calendar-app
@@ -17,18 +19,17 @@
Package: calendar-app
Architecture: all
Depends: ${misc:Depends},
+ libqt5contacts5,
+ libqt5organizer5,
qmlscene,
- qtdeclarative5-quicklayouts-plugin,
+ qml-module-qtcontacts,
+ qml-module-qtorganizer,
+ qml-module-qtquick-layouts,
+ qtcontact5-galera,
+ qtdeclarative5-ubuntu-syncmonitor0.1,
qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
- ${misc:Depends},
- libqt5organizer5,
- qtdeclarative5-qtorganizer-plugin,
qtorganizer5-eds,
- qtdeclarative5-ubuntu-syncmonitor0.1,
ubuntu-mobile-icons | suru-icon-theme,
- libqt5contacts5,
- qtdeclarative5-qtcontacts-plugin,
- qtcontact5-galera,
Description: Calendar application for Ubuntu devices
The Calendar application for Ubuntu devices lets you organise your life your
way by month, week or daily diary.
@@ -39,13 +40,12 @@
Package: calendar-app-autopilot
Architecture: all
-Depends: libautopilot-qt (>= 1.4),
- libqt5test5,
+Depends: address-book-service-dummy,
+ address-book-service-testability,
+ autopilot-qt5,
calendar-app (= ${source:Version}),
python3-dateutil,
ubuntu-ui-toolkit-autopilot,
- address-book-service-dummy,
- address-book-service-testability
Description: Autopilot tests for Ubuntu Calendar Application
This package contains autopilot tests for the Ubuntu Calendar application.
=== modified file 'tests/unittests/tst_event_bubble.qml'
--- tests/unittests/tst_event_bubble.qml 2016-03-31 19:19:33 +0000
+++ tests/unittests/tst_event_bubble.qml 2016-06-27 16:52:35 +0000
@@ -2,6 +2,8 @@
import QtTest 1.0
import QtOrganizer 5.0
+import "../../dateExt.js" as DATE
+
TestCase{
id: root
name: "Event Bubble tests"
@@ -107,8 +109,9 @@
function init()
{
var collectionId = get_collection_id_by_name(root.model, root.collection.name)
- var startDate = new Date(2016, 3, 28, 14, 0,0 )
- var endDate = new Date(2016, 3, 28, 15, 0,0 )
+ var startDate = new Date()
+ startDate = startDate.addDays(1)
+ var endDate = startDate.addMinutes(60)
var eventData = {"collectionId": collectionId,
"label": "Sample Test Event",
"allDay": false,
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
