Merge lp:~elopio/u1-test-utils/qa_anchor_test into lp:u1-test-utils

[Leo Arias]

Check the qa anchor only on the html tag, and added tests.

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'u1testutils/sst/__init__.py'
--- u1testutils/sst/__init__.py	2013-05-13 09:27:56 +0000
+++ u1testutils/sst/__init__.py	2013-05-16 18:17:34 +0000
@@ -167,7 +167,8 @@
 
     def assert_qa_anchor(self):
         """Assert the qa anchor."""
-        sst.actions.assert_element(**{'data-qa-id': self.qa_anchor})
+        sst.actions.assert_element(
+            tag='html', **{'data-qa-id': self.qa_anchor})
 
     def _log_errors(self):
         if sst.actions.exists_element(css_class='error'):

=== modified file 'u1testutils/sst/selftests/acceptance/test_page.py'
--- u1testutils/sst/selftests/acceptance/test_page.py	2013-04-19 18:10:34 +0000
+++ u1testutils/sst/selftests/acceptance/test_page.py	2013-05-16 18:17:34 +0000
@@ -27,7 +27,7 @@
 class StringHTMLPage(u1testutils.sst.Page):
 
     def __init__(self, page_source, title, headings1, headings2, url_path,
-                 is_url_path_regex):
+                 is_url_path_regex, qa_anchor=None):
         self.page_source = page_source
         self.title = title
         self.headings1 = headings1
@@ -39,6 +39,8 @@
             page_file_name = self._make_temp_page()
             self.url_path = page_file_name
         self.is_url_path_regex = is_url_path_regex
+        if qa_anchor:
+            self.qa_anchor = qa_anchor
         try:
             super(StringHTMLPage, self).__init__(open_page=True)
         finally:
@@ -172,3 +174,41 @@
         self.assertRaises(
             AssertionError, StringHTMLPage, **self.page_kwargs)
         self.assertLogLevelContains('ERROR', 'Test error')
+
+    def test_assert_correct_qa_anchor(self):
+        # Add the qa anchor to the page source.
+        soup = bs4.BeautifulSoup(self.page_source)
+        soup.html['data-qa-id'] = 'test_anchor'
+        self.page_kwargs['page_source'] = str(soup)
+        self.page_kwargs['qa_anchor'] = 'test_anchor'
+        # The title will not be asserted.
+        self.page_kwargs['title'] = 'Wrong title'
+        # The headings1 will not be asserted.
+        self.page_kwargs['headings1'] = ['Wrong h1']
+        # The headings 2 will not be asserted.
+        self.page_kwargs['headings2'] = ['Wrong h2']
+
+        # If the instantiation doesn't fail, it means we asserted it's the
+        # correct page only checking the anchor.
+        StringHTMLPage(**self.page_kwargs)
+
+    def test_assert_wrong_qa_anchor(self):
+        # Add the qa anchor to the page source.
+        soup = bs4.BeautifulSoup(self.page_source)
+        soup.html['data-qa-id'] = 'test_anchor'
+        self.page_kwargs['page_source'] = str(soup)
+        self.page_kwargs['qa_anchor'] = 'wrong_anchor'
+
+        self.assertRaises(AssertionError, StringHTMLPage, **self.page_kwargs)
+
+    def test_assert_qa_anchor_not_in_html_tag(self):
+        # Add the qa anchor to the page source.
+        soup = bs4.BeautifulSoup(self.page_source)
+        soup.html['data-qa-id'] = 'test_html_anchor'
+        div_element = soup.new_tag('div')
+        div_element['data-qa-id'] = 'test_div_anchor'
+        soup.body.append(div_element)
+        self.page_kwargs['page_source'] = str(soup)
+        self.page_kwargs['qa_anchor'] = 'test_div_anchor'
+
+        self.assertRaises(AssertionError, StringHTMLPage, **self.page_kwargs)

=== modified file 'u1testutils/sst/selftests/unit/test_pages.py'
--- u1testutils/sst/selftests/unit/test_pages.py	2013-04-19 03:10:36 +0000
+++ u1testutils/sst/selftests/unit/test_pages.py	2013-05-16 18:17:34 +0000
@@ -79,16 +79,36 @@
         mock_action.assert_called_with('/test/path')
         self.assertEquals(page, returned_page)
 
-    def test_assert_page_is_open(self):
+    def test_assert_page_is_open_without_qa_anchor(self):
         # All the mocked methods have acceptance tests.
         with contextlib.nested(
             mock.patch.object(Page, '_is_oops_displayed', return_value=False),
             mock.patch.object(Page, 'assert_title'),
             mock.patch.object(Page, 'assert_url_path'),
         ) as mock_checks:
-            PageWithoutCheck().assert_page_is_open()
-        for mock_check in mock_checks:
-            mock_check.assert_called_once_with()
+            with mock.patch.object(Page, 'assert_qa_anchor') as mock_anchor:
+                PageWithoutCheck().assert_page_is_open()
+
+        for mock_check in mock_checks:
+            mock_check.assert_called_once_with()
+        self.assertFalse(mock_anchor.called)
+
+    def test_assert_page_is_open_with_anchor(self):
+        # All the mocked methods have acceptance tests.
+        with contextlib.nested(
+            mock.patch.object(Page, '_is_oops_displayed', return_value=False),
+            mock.patch.object(Page, 'assert_qa_anchor'),
+            mock.patch.object(Page, 'assert_url_path')
+        ) as mock_checks:
+            with mock.patch.object(Page, 'assert_title') as mock_title:
+                page = PageWithoutCheck()
+                page.qa_anchor = 'test_anchor'
+
+            page.assert_page_is_open()
+
+        for mock_check in mock_checks:
+            mock_check.assert_called_once_with()
+        self.assertFalse(mock_title.called)
 
 
 class PageWithOnlyHeadingsAssertions(PageWithoutCheck):