set_article_comment_box and edit_article should return a KnowledgeBas…

…eShowHistory page

because the xfail should actually xpass - assert done inside
is_the_current_page

pages/desktop/knowledge_base_article.py

@@ -126,7 +126,7 @@ def edit_article(self, article_info_dict):
         self.set_article_summary(article_info_dict['summary'])
         self.set_article_content(article_info_dict['content'])
         self.submit_article()
-        self.set_article_comment_box()
+        return self.set_article_comment_box()
 
     def set_article_keyword(self, keyword):
         element = self.selenium.find_element(*self._article_keywords_box_locator)
@@ -146,6 +146,9 @@ def set_article_content(self, content):
     def set_article_comment_box(self, comment='automated test'):
         self.selenium.find_element(*self._comment_box_locator).send_keys(comment)
         self.selenium.find_element(*self._comment_submit_btn_locator).click()
+        kb_article_history = KnowledgeBaseShowHistory(self.testsetup)
+        kb_article_history.is_the_current_page
+        return kb_article_history
 
     def submit_article(self):
         self.selenium.find_element(*self._article_submit_btn_locator).click()

tests/desktop/test_kb_article.py

@@ -60,9 +60,6 @@ def test_that_article_can_be_edited(self, mozwebqa):
         kb_new_article.submit_article()
         kb_article_history = kb_new_article.set_article_comment_box()
 
-        # verify article history
-        Assert.true(kb_article_history.is_the_current_page)
-
         # edit that same article
         timestamp = datetime.datetime.now()
         edited_article_summary = "this is an automated summary__%s_edited" % timestamp