Merge lp:~sergiusens/ubuntu-rssreader-app/clicker into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Sergio Schvezov]

Changing to final click name

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

85. By Sergio Schvezov on 2013-10-07

Merging trunk

86. By Sergio Schvezov on 2013-10-07

localstorage adaptations

[Joey Chan (qqworini)]

Where is Jenkins Bot ?

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

review: Approve (continuous-integration)

=== renamed file 'apparmor/rssreader-app.json' => 'apparmor/shorts.json'
=== modified file 'manifest.json'
--- manifest.json	2013-10-02 03:42:50 +0000
+++ manifest.json	2013-10-07 12:50:16 +0000
@@ -2,14 +2,14 @@
     "description": "RSS Reader application",
     "framework": "ubuntu-sdk-13.10",
     "hooks": {
-        "rssreader-app": {
-            "apparmor": "apparmor/rssreader-app.json",
+        "shorts": {
+            "apparmor": "apparmor/shorts.json",
             "desktop": "rssreader-app.desktop"
         }
     },
     "icon": "rssreader64.png",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.rssreader",
+    "name": "com.ubuntu.shorts",
     "title": "shorts",
     "version": "0.2"
 }

=== modified file 'rssreader-app.qml'
--- rssreader-app.qml	2013-10-07 05:19:06 +0000
+++ rssreader-app.qml	2013-10-07 12:50:16 +0000
@@ -13,7 +13,7 @@
     // objectName for functional testing purposes (autopilot-qt5)
     id: mainView
     objectName: "mainView"
-    applicationName: "rssreader-app"
+    applicationName: "com.ubuntu.shorts"
 
     width: units.gu(50)
     height: units.gu(75)

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-10-03 19:17:30 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-10-07 12:50:16 +0000
@@ -48,7 +48,8 @@
     local_location = "../../rssreader-app.qml"
     installed_location = "/usr/share/rssreader-app/rssreader-app.qml"
 
-    sqlite_dir = os.path.expanduser("~/.local/share/rssreader-app/Databases")
+    sqlite_dir = os.path.expanduser(
+        "~/.local/share/com.ubuntu.shorts/Databases")
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
@@ -89,7 +90,7 @@
 
     def launch_test_click(self):
         self.app = self.launch_click_package(
-            "com.ubuntu.rssreader-app",
+            "com.ubuntu.shorts",
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):