Merge lp:~hiroshidi/ubuntu-terminal-app/autopilot-header-and-settings into lp:ubuntu-terminal-app

[Dmitry Zagnoyko]

Add more autopilot tests:
- test for font size
- test for color schemes
- test for Header shows/hides

Emulators and tests updated according to changes in UbuntuSDK
Added more autopilot tests:
- test for font size
- test for color schemes
- test for Header shows/hides
Fixes in the terminal app:
- ToolbarActions -> ToolbarItems
- added 'objectName' property for items
- added missing handling for height changing

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

PASSED: Continuous integration, rev:20
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/1/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/1

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/1/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

We spoke about the sliders and the width issue. When I hear back on the orientation testing I'll let you know. On the sliders, I'm confused if there's a sdk issue here or not.

[lp:~hiroshidi/ubuntu-terminal-app/autopilot-header-and-settings]

21. By Dmitry Zagnoyko on 2013-07-19

Updated test and emulators according to changes in UbuntuSDK API

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

PASSED: Continuous integration, rev:21
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/7/rebuild

review: Approve (continuous-integration)

[lp:~hiroshidi/ubuntu-terminal-app/autopilot-header-and-settings]

22. By Dmitry Zagnoyko on 2013-07-19

Added some comment

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

PASSED: Continuous integration, rev:22
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/3
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/3

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~hiroshidi/ubuntu-terminal-app/autopilot-header-and-settings]

23. By Dmitry Zagnoyko on 2013-07-19

comment out broken test

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

PASSED: Continuous integration, rev:23
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/9/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/4
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/4

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/9/rebuild

review: Approve (continuous-integration)

=== modified file 'Configs.qml'
--- Configs.qml	2013-05-06 19:03:02 +0000
+++ Configs.qml	2013-07-19 21:31:27 +0000
@@ -33,6 +33,7 @@
 
         ListItem.ValueSelector {
             id: liSchemes
+            objectName: "liSchemes"
             width: parent.width
 
             function setValue(val) {
@@ -61,6 +62,7 @@
 
         Slider{
             id: slFont
+            objectName: "slFont"
             anchors {
                 left: parent.left
                 leftMargin: units.gu(2)

=== modified file 'config/JsConfig.qml'
--- config/JsConfig.qml	2013-06-03 16:21:45 +0000
+++ config/JsConfig.qml	2013-07-19 21:31:27 +0000
@@ -24,7 +24,7 @@
     }
 
     function setFontSize(size){
-        dbEngine.setConfig("fontSize",size.toString() );
+        dbEngine.setConfig("fontSize", Math.round(size).toString() );
     }
 
 }

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_terminal_app/emulators/main_window.py	2013-06-19 18:51:53 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators/main_window.py	2013-07-19 21:31:27 +0000
@@ -14,8 +14,41 @@
         self.app = app
         self.autopilot = autopilot
 
-    def click_popup_item(self, popupLable):
+    def get_qml_view(self):
+        """Get the main QML view"""
+        return self.app.select_single("QQuickView")
+
+    def get_header_item(self):
+        """Get the header"""
+        return  self.app.select_single("Header")
+
+    def get_slider_item(self, slider):
+        """Get the header"""
+        return  self.app.select_single("Slider", objectName=slider)
+
+    def expand_width(self, val):
+        """Expand width of the main QML view"""
+        qmlView = self.get_qml_view()
+        startX = int(qmlView.x + qmlView.width)
+        stopX = int(qmlView.x + qmlView.width + val)
+        lineY = int(qmlView.height/2)
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+
+    def expand_height(self, val):
+        """Expand height of the main QML view"""
+        qmlView = self.get_qml_view()
+        startY = int(qmlView.y + qmlView.height)
+        stopY = int(qmlView.y + qmlView.height + val)
+        lineX = int(qmlView.width/2)
+        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
+
+    def click_action_selection_popup_item(self, popupLable):
         """Clicks the toolbar popup item with popupLable"""
+        # The action selection is assumed to be the following format
+        # ActionSelectionPopover {
+        #    actions: ActionList {
+        #        Action {
+        #              text: 
         li  = self.app.select_single("ActionSelectionPopover")
         row = li.select_single("QQuickColumn")
         loaderList = row.select_many("QQuickLoader")
@@ -25,3 +58,57 @@
                 if label.text == popupLable:
                     self.autopilot.pointing_device.click_object(label)
 
+    def click_value_selector_item(self, selector, value):
+        """Clicks value from value selector"""
+        # The value selector is assumed to be the following format
+        # ListItem.ValueSelector {
+        #    objectName: 
+        #    values:
+        val_selector = self.app.select_single("ValueSelector", objectName=selector)
+        self.autopilot.pointing_device.click_object(val_selector)
+        rows = val_selector.select_single("QQuickColumn")
+        rects = rows.select_many("QQuickRectangle")
+        for ritem in rects:
+            labelList = ritem.select_many("LabelVisual")
+            for label in labelList:
+                if label.text == value:
+                    self.autopilot.pointing_device.click_object(label)
+
+    def tap_horizontal_slider(self, slider, pos):
+        """Tap slider at position"""
+        slItem = self.get_slider_item(slider)
+        x, y, w, h = slItem.globalRect
+
+        # pos to click inside the slider, px  
+        self.autopilot.pointing_device.move(x+pos, y+(h/2))
+        self.autopilot.pointing_device.click()
+
+    def drag_horizontal_slider(self, slider, pos):
+        """Drag slider by delta value"""
+        # The slider is assumed to be the following format
+        # Slider {
+        #    objectName: 
+        #    minimumValue: 
+        #    maximumValue:
+        slItem = self.get_slider_item(slider)
+        slRect = slItem.select_single("SliderStyle")
+
+        # calculate required shift per position
+        thumbSpace = slRect.thumbSpace
+        minVal = slItem.minimumValue
+        maxVal = slItem.maximumValue
+        shift  = thumbSpace/(maxVal-minVal)
+
+        # get thumb to drag
+        ushapes = slItem.select_many("UbuntuShape")
+        slThumb = ushapes[0]
+        for ushape in ushapes:
+            if ushape.width == slRect.thumbWidth:
+                slThumb = ushape
+
+        x, y, w, h = slThumb.globalRect
+        sx = x+w/2
+        sy = y+h/2 
+        self.autopilot.pointing_device.drag(sx, sy, sx+(shift*pos), sy)
+
+

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py	2013-06-19 18:51:53 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py	2013-07-19 21:31:27 +0000
@@ -38,6 +38,10 @@
         """Get more than one object"""
         return self.app.select_many(typeName, objectName=name)
 
+    def get_tabs(self):
+        """Return all tabs"""
+        return self.app.select_single("Tabs")
+
     def switch_to_tab(self, tab):
         """Switch to the specified tab number"""
         tabs = self.get_tabs()
@@ -46,11 +50,37 @@
         #perform operations until tab == currentTab
         while tab != currentTab:
             if tab > currentTab:
+                self._next_tab()
+            if tab < currentTab:
                 self._previous_tab()
-            if tab < currentTab:
-                self._next_tab()
             currentTab = tabs.selectedTabIndex
 
+    def _previous_tab(self):
+        """Switch to the previous tab"""
+        qmlView = self.get_qml_view()
+
+        startX = int(qmlView.x + qmlView.width * 0.10)
+        stopX = int(qmlView.x + qmlView.width * 0.45)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.move(startX, lineY)
+        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
+
+    def _next_tab(self):
+        """Switch to the next tab"""
+        qmlView = self.get_qml_view()
+
+        startX = int(qmlView.x + qmlView.width * 0.45)
+        stopX = int(qmlView.x + qmlView.width * 0.10)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.move(startX, lineY)
+        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
+
     def toggle_toolbar(self):
         """Toggle the toolbar between revealed and hidden"""
         #check and see if the toolbar is open or not
@@ -68,10 +98,10 @@
         toolbar = self.get_toolbar()
         if not toolbar.opened:
             self.open_toolbar()
-        row = toolbar.select_single("QQuickRow")
+        row = toolbar.select_single("ToolbarItems")
         loaderList = row.select_many("QQuickLoader")
         for loader in loaderList:
-            buttonList = loader.select_many("Button")
+            buttonList = loader.select_many("Label")
             for button in buttonList:
                 if button.text == buttonLabel:
                     return button
@@ -79,10 +109,11 @@
     def click_toolbar_button(self, buttonLabel):
         """Clicks the toolbar button with buttonLabel"""
         #The toolbar button is assumed to be the following format
-        #ToolbarActions {
-        #           Action {
-        #               objectName: "name"
-        #                text: value
+        # ToolbarItems {
+        #    ToolbarButton {
+        #       id: 
+        #       action: Action {
+        #                  text: 
         button = self.get_toolbar_button(buttonLabel)
         self.autopilot.pointing_device.click_object(button)
 
@@ -90,9 +121,9 @@
         """Open the toolbar"""
         qmlView = self.get_qml_view()
 
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height - 1
-        stopY = qmlView.y + qmlView.height * 0.95
+        lineX = int(qmlView.x + qmlView.width * 0.50)
+        startY = int(qmlView.y + qmlView.height - 1)
+        stopY = int(qmlView.y + qmlView.height * 0.95)
 
         self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
 
@@ -100,9 +131,9 @@
         """Hide the toolbar"""
         qmlView = self.get_qml_view()
 
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height * 0.95
-        stopY = qmlView.y + qmlView.height - 1
+        lineX = int(qmlView.x + qmlView.width * 0.50)
+        startY = int(qmlView.y + qmlView.height * 0.95)
+        stopY = int(qmlView.y + qmlView.height - 1)
 
         self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
 
@@ -111,44 +142,16 @@
         At the moment this only works for values that are currently visible. To
         access the remaining items, a help method to drag and recheck is needed."""
         #The popover is assumed to be the following format
-        #    Popover {
-        #        Column {
-        #            ListView {
-        #                delegate: Standard {
-        #                    objectName: "name"
-        #                    text: value
-
-        self.autopilot.pointing_device.click_object(button)
-        #we'll get all matching objects, incase the popover is reused between buttons
-        itemList = lambda: self.get_objects("Standard", popover)
-
-        for item in itemList():
-            if item.get_properties()['text'] == value:
+        #Component {
+        #    id: actionSelectionPopover
+        #
+        #ActionSelectionPopover {
+        #                actions: ActionList {
+        #                    Action {
+
+        popList = self.get_object("ActionSelectionPopover", popover)
+        itemList = popList.select_many("Label")
+        for item in itemList:
+            if item.text == value:
                 self.autopilot.pointing_device.click_object(item)
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.get_object("Tabs", "rootTabs")
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.35
-        stopX = qmlView.x + qmlView.width * 0.50
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.50
-        stopX = qmlView.x + qmlView.width * 0.35
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
+                return item

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-06-19 18:51:53 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-07-19 21:31:27 +0000
@@ -8,6 +8,7 @@
 """Terminal app autopilot tests."""
 
 import os.path
+import sqlite3
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
@@ -54,8 +55,66 @@
     @property
     def main_window(self):
         return MainWindow(self, self.app)
-        
+
     @property
     def ubuntu_sdk(self):
         return ubuntusdk(self, self.app)
-        
+
+
+class DbMan(object):
+    """
+    Helper functions for dealing with sqlite databases
+    """
+
+    def get_db(self):
+        dbs_path = os.path.expanduser("~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/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" ]
+        for f in files:
+            ini_path = os.path.join(dbs_path, f)
+            with open(ini_path) as ini:
+                for line in ini:
+                    if "=" in line:
+                        key, val = line.strip().split("=")
+                        if key == "Name" and val == "UbuntuTerminalDB":
+                            try:
+                                return ini_path.replace(".ini", ".sqlite")
+                            except OSError:
+                                pass
+        return None
+
+    def clean_db(self):
+        path = self.get_db()
+        if path is None:
+            self.assertNotEquals(path, None)
+        try:
+            os.remove(path)
+        except OSError:
+            pass
+
+    def get_font_size_from_storage(self):
+        db = self.get_db()
+        conn = sqlite3.connect(db)
+
+        with conn:
+            cur = conn.cursor()    
+            cur.execute("SELECT value FROM config WHERE item='fontSize'")
+            row = cur.fetchone()
+            if row is None:
+                self.assertNotEquals(row, None)
+            return int(row[0])
+            
+    def get_color_scheme_from_storage(self):
+        db = self.get_db()
+        conn = sqlite3.connect(db)
+
+        with conn:
+            cur = conn.cursor()    
+            cur.execute("SELECT value FROM config WHERE item='colorScheme'")
+            row = cur.fetchone()
+            if row is None:
+                self.assertNotEquals(row, None)
+            return row[0]
+

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-06-19 18:51:53 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-07-19 21:31:27 +0000
@@ -10,13 +10,13 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals
+from testtools.matchers import Equals, GreaterThan
 
-from ubuntu_terminal_app.tests import TerminalTestCase
+from ubuntu_terminal_app.tests import TerminalTestCase, DbMan
 
 import time
 
-class TestMainWindow(TerminalTestCase):
+class TestMainWindow(TerminalTestCase, DbMan):
 
     def setUp(self):
         super(TestMainWindow, self).setUp()
@@ -26,52 +26,129 @@
     def tearDown(self):
         super(TestMainWindow, self).tearDown()
 
-    def test_Control_Panel_shows(self):
+    def test_control_panel_shows(self):
         """Make sure that Control Keys Panel is visible
         when clicking the toolbar popup items."""
         self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_popup_item("Control keys")
+        self.main_window.click_action_selection_popup_item("Control keys")
         panelCtrl = self.ubuntu_sdk.get_object("CtrlKeys", "kbCtrl")
         self.assertThat(panelCtrl.visible, Eventually(Equals(True)))
-        
-    def test_Function_Panel_shows(self):
+
+    def test_function_panel_shows(self):
         """Make sure that Function Keys Panel is visible
         when clicking the toolbar popup items."""
         self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_popup_item("Function keys")
+        self.main_window.click_action_selection_popup_item("Function keys")
         panelFunc = self.ubuntu_sdk.get_object("FnKeys", "kbFn")
         self.assertThat(panelFunc.visible, Eventually(Equals(True)))
-        
+
     def test_TextCtrl_Panel_shows(self):
         """Make sure that Text Control Keys Panel is visible
         when clicking the toolbar popup items."""
         self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_popup_item("Text ctrl keys")
+        self.main_window.click_action_selection_popup_item("Text ctrl keys")
         panelScrl = self.ubuntu_sdk.get_object("ScrlKeys", "kbScrl")
         self.assertThat(panelScrl.visible, Eventually(Equals(True)))
-        
-    def test_Panels_hide(self):
+
+    def test_panels_hide(self):
         """Make sure that all panels are hide
         when clicking the toolbar popup items."""
         self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_popup_item("Hide extra panel")
+        self.main_window.click_action_selection_popup_item("Hide extra panel")
         panelCtrl = self.ubuntu_sdk.get_object("CtrlKeys", "kbCtrl")
         panelFunc = self.ubuntu_sdk.get_object("FnKeys", "kbFn")
         panelScrl = self.ubuntu_sdk.get_object("ScrlKeys", "kbScrl")
         self.assertThat(panelCtrl.visible, Eventually(Equals(False)))
         self.assertThat(panelFunc.visible, Eventually(Equals(False)))
         self.assertThat(panelScrl.visible, Eventually(Equals(False)))
-        
-    def test_CircleMenu_shows(self):
+
+    def test_circle_menu_shows(self):
         """Make sure that Circle Menu is visible
         on long tap"""
-        kterm = self.ubuntu_sdk.get_object("KTerminalDisplay", "kterm")
+        kterm = self.ubuntu_sdk.get_object("Terminal", "pgTerm")
         menu = self.ubuntu_sdk.get_object("CircleMenu", "cmenu")
         self.pointing_device.click_object(kterm)
         self.pointing_device.press()
         time.sleep(1)
         self.pointing_device.release()
         self.assertThat(menu.visible, Eventually(Equals(True)))
-        
-        
-        
+
+    def test_header_shows(self):
+        """Make sure that Header is visible
+        in Portrait Mode"""
+        qmlView = self.ubuntu_sdk.get_qml_view()
+        header = self.main_window.get_header_item()
+        self.main_window.expand_width(10)
+        self.assertThat(qmlView.height, Eventually(GreaterThan(qmlView.width)))
+        self.assertThat(header.visible, Eventually(Equals(True)))
+
+    def test_header_hides(self):
+        """Make sure that Header is not visible
+        in Landscape Mode"""
+        qmlView = self.ubuntu_sdk.get_qml_view()
+        header = self.main_window.get_header_item()
+        self.main_window.expand_width(400)
+        self.assertThat(qmlView.width, Eventually(GreaterThan(qmlView.height)))
+        self.assertThat(header.visible, Eventually(Equals(False)))
+    
+    
+    # broken testcase. should be uncommented 
+    # and tested with latest update of ubuntu sdk
+    
+    #def test_color_scheme_changes(self):
+    #    """Make sure that color scheme is set correctly"""
+    #    qmlView = self.ubuntu_sdk.get_qml_view()
+    #    # kterm = self.ubuntu_sdk.get_object("KTerminalDisplay", "kterm")
+    #    self.ubuntu_sdk.switch_to_tab(1)
+
+    #    schemeList = ("DarkPastels", 
+    #        "Linux",
+    #        "BlackOnRandomLight",
+    #        "BlackOnWhite",
+    #        "BlackOnLightYellow",
+    #        "GreenOnBlack",
+    #        "WhiteOnBlack",
+    #        )
+
+    #    for scheme in schemeList:
+    #        self.main_window.click_value_selector_item("liSchemes",scheme)
+    #        # This assert uses KTerminalDisplay property (old rev)
+    #        # self.assertThat(kterm.colorScheme, Eventually(Equals(scheme)))
+    #        time.sleep(0.3)
+    #        # This assert uses localstorage (new rev)
+    #        colorScheme = self.get_color_scheme_from_storage()
+    #        self.assertThat(colorScheme, Equals(scheme))
+
+
+    def test_font_size_changes(self):
+        """Make sure that font size is set correctly"""
+        self.ubuntu_sdk.switch_to_tab(1)
+        slider = self.main_window.get_slider_item("slFont")
+
+        # start and end positions
+        i = int(slider.minimumValue) + 1
+        iMax = int(slider.maximumValue)
+
+        # return to start position of the slider
+        self.main_window.tap_horizontal_slider("slFont",5)
+        time.sleep(0.3)
+        font_size = self.get_font_size_from_storage()
+        self.assertThat(font_size, Equals(8))
+
+        p = 1
+        while ( i < (iMax+1) ):
+            # WARNING - MAGIC nums: should be removed with better case
+            if (i == 18):
+                p = 1.4
+            if (i == 20):
+                p = 1
+
+            self.main_window.drag_horizontal_slider("slFont",p)
+            time.sleep(0.3)
+            font_size = self.get_font_size_from_storage()
+            self.assertThat(font_size, Equals(i))
+            i+=1
+
+
+
+

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-06-19 15:19:47 +0000
+++ ubuntu-terminal-app.qml	2013-07-19 21:31:27 +0000
@@ -40,6 +40,7 @@
 
     Tabs {
         id: tabs
+        objectName: "rootTabs"
         anchors.fill: parent
         
         Tab {
@@ -51,14 +52,23 @@
                     header.visible = width < height;
                 }
 
-                Terminal { id: pgTerm  }
-
-                tools: ToolbarActions {
-                    Action {
-                        id: toolbarAction
-                        text: "Panels"
-                        iconSource: Qt.resolvedUrl("avatar.png")
-                        onTriggered: PopupUtils.open(actionSelectionPopover, caller)
+                onHeightChanged: {
+                    header.visible = width < height;
+                }
+
+                Terminal { 
+                    id: pgTerm
+                    objectName: "pgTerm"  
+                }
+
+                tools: ToolbarItems {
+                    ToolbarButton {
+                           id: toolbarAction
+                           action: Action {
+                                text: "Panels"
+                                iconSource: Qt.resolvedUrl("avatar.png")
+                                onTriggered: PopupUtils.open(actionSelectionPopover, toolbarAction)
+                           }
                     }
                 }