Merge lp:~sergiusens/ubuntu-terminal-app/clicker into lp:ubuntu-terminal-app

[Sergio Schvezov]

Upstreaming click support

[lp:~sergiusens/ubuntu-terminal-app/clicker]

27. By Sergio Schvezov on 2013-10-08

Fixing domain and pep8 issues in __init__.py for tests

28. By Sergio Schvezov on 2013-10-08

Fixing domain for terminal.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== added directory 'apparmor'
=== added file 'apparmor/terminal.json'
--- apparmor/terminal.json	1970-01-01 00:00:00 +0000
+++ apparmor/terminal.json	2013-10-08 10:12:15 +0000
@@ -0,0 +1,4 @@
+{
+    "policy_version": 1.0, 
+    "template": "unconfined"
+}
\ No newline at end of file

=== added file 'manifest.json'
--- manifest.json	1970-01-01 00:00:00 +0000
+++ manifest.json	2013-10-08 10:12:15 +0000
@@ -0,0 +1,16 @@
+{
+    "architecture": "armhf", 
+    "description": "Terminal application", 
+    "framework": "ubuntu-sdk-13.10", 
+    "hooks": {
+        "terminal": {
+            "apparmor": "apparmor/terminal.json", 
+            "desktop": "ubuntu-terminal-app.desktop"
+        }
+    }, 
+    "icon": "terminal64.png", 
+    "maintainer": "Ubuntu App Cats <[e-mail]>", 
+    "name": "com.ubuntu.terminal", 
+    "title": "terminal", 
+    "version": "0.5"
+}

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-10-03 17:23:45 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-10-08 10:12:15 +0000
@@ -30,7 +30,8 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-terminal-app.qml"
-    installed_location = "/usr/share/ubuntu-terminal-app/ubuntu-terminal-app.qml"
+    installed_location = \
+        "/usr/share/ubuntu-terminal-app/ubuntu-terminal-app.qml"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
@@ -60,23 +61,28 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_click(self):
-        self.app = self.launch_click_package("com.ubuntu.ubuntu-terminal-app", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+        self.app = self.launch_click_package(
+            "com.ubuntu.terminal",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     @property
     def main_view(self):
         return self.app.select_single(emulators.MainView)
 
+
 class DbMan(object):
     """
     Helper functions for dealing with sqlite databases
     """
 
     def get_db(self):
-        dbs_path = os.path.expanduser("~/.local/share/ubuntu-terminal-app/Databases")
+        dbs_path = os.path.expanduser(
+            "~/.local/share/com.ubuntu.terminal/Databases")
         if not os.path.exists(dbs_path):
             return None
 
-        files = [ f for f in os.listdir(dbs_path) if os.path.splitext(f)[1] == ".ini" ]
+        files = [f for f in os.listdir(dbs_path)
+                 if os.path.splitext(f)[1] == ".ini"]
         for f in files:
             ini_path = os.path.join(dbs_path, f)
             with open(ini_path) as ini:
@@ -122,4 +128,3 @@
             if row is None:
                 self.assertNotEquals(row, None)
             return row[0]
-

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-08-08 22:51:33 +0000
+++ ubuntu-terminal-app.qml	2013-10-08 10:12:15 +0000
@@ -7,7 +7,7 @@
     // objectName for functional testing purposes (autopilot-qt5)
     id: mview
     objectName: "terminal"
-    applicationName: "ubuntu-terminal-app"
+    applicationName: "com.ubuntu.terminal"
     automaticOrientation: true
 
     width: units.gu(50)