Permalink
Browse files

move pages and tests to their new locations

GitHub really is trying to make my life difficult by breaking this up
into change set's I don't expect.
  • Loading branch information...
1 parent 1d1dbc7 commit 140b89dc08065ea70b3ed7e6884e582589edebee @klrmn klrmn committed Feb 16, 2012
File renamed without changes.
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
class ForumsPage(Base):
@@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
-from page import Page
+from pages.base import Base
+from pages.page import Page
class KnowledgeBase(Base):
@@ -134,15 +134,15 @@ class KnowledgeBaseShowHistory(KnowledgeBase):
#history of the test
_top_revision_comment = "css=#revision-list li:nth-child(2) > div.comment"
-
+
_show_chart_link_locator = 'id=show-chart'
_helpfulness_chart_locator = 'id=helpful-chart'
_helpfulness_chart_graph_locator = 'css=svg > rect'
def click_show_helpfulness_chart(self):
self.selenium.click(self._show_chart_link_locator)
self.wait_for_element_visible(self._helpfulness_chart_locator)
-
+
@property
def is_helpfulness_chart_visible(self):
# Because of bug 723575 there are two element checks to assert that the graph has actually loaded
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
class KnowledgeBaseNewArticle(Base):
@@ -7,7 +7,7 @@
@author: mozilla
'''
-from base import Base
+from pages.base import Base
class LoginPage(Base):
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
class QuestionsPage(Base):
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
class RefineSearchPage(Base):
@@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
import string
import random
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
class SearchPage(Base):
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from base import Base
+from pages.base import Base
import re
import time
File renamed without changes.
@@ -3,12 +3,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from knowledge_base_new_article import KnowledgeBaseNewArticle
-from knowledge_base_article import KnowledgeBaseArticle
-from knowledge_base_article import KnowledgeBaseShowHistory
-from knowledge_base_article import KnowledgeBaseEditArticle
-from knowledge_base_article import KnowledgeBaseTranslate
-from login_page import LoginPage
+from pages.desktop.knowledge_base_new_article import KnowledgeBaseNewArticle
+from pages.desktop.knowledge_base_article import KnowledgeBaseArticle
+from pages.desktop.knowledge_base_article import KnowledgeBaseShowHistory
+from pages.desktop.knowledge_base_article import KnowledgeBaseEditArticle
+from pages.desktop.knowledge_base_article import KnowledgeBaseTranslate
+from pages.desktop.login_page import LoginPage
import re
import pytest
import datetime
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from search_page import SearchPage
+from pages.desktop.search_page import SearchPage
import pytest
@@ -3,9 +3,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from questions_page import ViewQuestionPage
-from questions_page import AskNewQuestionsPage
-from login_page import LoginPage
+from pages.desktop.questions_page import ViewQuestionPage
+from pages.desktop.questions_page import AskNewQuestionsPage
+from pages.desktop.login_page import LoginPage
import datetime
import pytest
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from register_page import RegisterPage
+from pages.desktop.register_page import RegisterPage
import pytest
@@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from refine_search_page import RefineSearchPage
-from login_page import LoginPage
+from pages.desktop.refine_search_page import RefineSearchPage
+from pages.desktop.login_page import LoginPage
import pytest
xfail = pytest.mark.xfail
@@ -2,8 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from questions_page import ViewQuestionPage
-from questions_page import QuestionsPage
+from pages.desktop.questions_page import ViewQuestionPage
+from pages.desktop.questions_page import QuestionsPage
import pytest
@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from questions_page import QuestionsPage
+from pages.desktop.questions_page import QuestionsPage
import pytest
File renamed without changes.
@@ -4,13 +4,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from unittestzero import Assert
-from support_home_page import SupportHomePage
-from knowledge_base_article import KnowledgeBaseArticle
-from knowledge_base_article import KnowledgeBaseShowHistory
+from pages.desktop.support_home_page import SupportHomePage
+from pages.desktop.knowledge_base_article import KnowledgeBaseArticle
+from pages.desktop.knowledge_base_article import KnowledgeBaseShowHistory
import pytest
class TestViewHelpfulnessChart:
-
+
@pytest.mark.fft
def test_view_helpfulness_chart(self, mozwebqa):
"""
@@ -23,12 +23,12 @@ def test_view_helpfulness_chart(self, mozwebqa):
kb_article_history = KnowledgeBaseShowHistory(mozwebqa)
sumo_homepage.go_to_support_home_page()
- sumo_homepage.click_first_top_issues_link()
-
+ sumo_homepage.click_first_top_issues_link()
+
kb_article.navigation.click_show_history()
-
+
# verify article history page loaded
Assert.true(kb_article_history.is_the_current_page)
-
+
kb_article_history.click_show_helpfulness_chart()
Assert.true(kb_article_history.is_helpfulness_chart_visible)

0 comments on commit 140b89d

Please sign in to comment.