ubuntu-touch-coreapps-reviewers team mailing list archive

[Nicholas Skaggs <nskaggs@xxxxxxxxxx>]

Nicholas Skaggs has proposed merging lp:~nskaggs/ubuntu-calculator-app/fix-testability into lp:ubuntu-calculator-app.

Commit message:
Fix testability for screen components

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~nskaggs/ubuntu-calculator-app/fix-testability/+merge/262019

Fix testability for screen components
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~nskaggs/ubuntu-calculator-app/fix-testability into lp:ubuntu-calculator-app.

=== modified file 'app/ui/Screen.qml'
--- app/ui/Screen.qml	2015-03-12 21:21:47 +0000
+++ app/ui/Screen.qml	2015-06-15 21:25:12 +0000
@@ -23,6 +23,7 @@
 
 ListItemWithActions {
     id: root
+    objectName: "screenroot" + model.index
 
     function formatDate(date) {
         var now = new Date();
@@ -52,6 +53,8 @@
 
     color: "white"
     Column {
+        id: calculationCol
+        objectName: "screencolumn"
         anchors.fill: parent
         Row {
             id: creationDateRow
@@ -97,7 +100,7 @@
 
             Text {
                 id: result
-                objectName: "result"
+                objectName: "result" + model.index
 
                 anchors.bottom: formula.bottom
 
@@ -122,7 +125,7 @@
 
             Text {
                 id: formula
-                objectName: "formula"
+                objectName: "formula" + model.index
 
                 width: parent.width - equal.width - result.width
                 anchors.bottom: parent.bottom

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2015-04-30 08:33:46 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2015-06-15 21:25:12 +0000
@@ -97,7 +97,7 @@
             os.path.expanduser('~'),
             '.local',
             'share',
-            'com.ubuntu.calculator_reboot'
+            'com.ubuntu.calculator'
         )
 
         if os.path.exists(calculator_database_path):