Merge pull request #2452 from edx/will/pages-setup-script

Updated bok choy page objects setup.py

.gitignore

@@ -89,3 +89,4 @@ build
 lms/lib/comment_client/python
 autodeploy.properties
 .ws_migrations_complete
+dist

common/test/acceptance/edxapp_pages/lms/register.py → common/test/acceptance/pages/lms/register.py

@@ -20,6 +20,7 @@ class RegisterPage(PageObject):
         super(RegisterPage, self).__init__(browser)
         self._course_id = course_id
 
+    @property
     def url(self):
         """
         URL for the registration page of a course.

common/test/acceptance/setup.py

@@ -4,11 +4,16 @@
 Install bok-choy page objects for acceptance and end-to-end tests.
 """
 
+import os
 from setuptools import setup
 
 VERSION = '0.0.1'
 DESCRIPTION = "Bok-choy page objects for edx-platform"
 
+# Pip 1.5 will try to install this package from outside
+# the directory containing setup.py, so we need to use an absolute path.
+PAGES_PACKAGE_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'pages')
+
 setup(
     name='edxapp-pages',
     version=VERSION,
@@ -25,5 +30,6 @@ setup(
         'Topic :: Software Development :: Testing',
         'Topic :: Software Development :: Quality Assurance'
     ],
+    package_dir={'edxapp_pages': PAGES_PACKAGE_DIR},
     packages=['edxapp_pages', 'edxapp_pages.lms', 'edxapp_pages.studio']
 )

common/test/acceptance/tests/test_lms.py

@@ -6,16 +6,16 @@ from bok_choy.web_app_test import WebAppTest
 from bok_choy.promise import EmptyPromise, fulfill_before
 
 from .helpers import UniqueCourseTest, load_data_str
-from ..edxapp_pages.studio.auto_auth import AutoAuthPage
-from ..edxapp_pages.lms.login import LoginPage
-from ..edxapp_pages.lms.find_courses import FindCoursesPage
-from ..edxapp_pages.lms.course_about import CourseAboutPage
-from ..edxapp_pages.lms.register import RegisterPage
-from ..edxapp_pages.lms.course_info import CourseInfoPage
-from ..edxapp_pages.lms.tab_nav import TabNavPage
-from ..edxapp_pages.lms.course_nav import CourseNavPage
-from ..edxapp_pages.lms.progress import ProgressPage
-from ..edxapp_pages.lms.video import VideoPage
+from ..pages.studio.auto_auth import AutoAuthPage
+from ..pages.lms.login import LoginPage
+from ..pages.lms.find_courses import FindCoursesPage
+from ..pages.lms.course_about import CourseAboutPage
+from ..pages.lms.register import RegisterPage
+from ..pages.lms.course_info import CourseInfoPage
+from ..pages.lms.tab_nav import TabNavPage
+from ..pages.lms.course_nav import CourseNavPage
+from ..pages.lms.progress import ProgressPage
+from ..pages.lms.video import VideoPage
 from ..fixtures.course import CourseFixture, XBlockFixtureDesc, CourseUpdateDesc
 
 

common/test/acceptance/tests/test_ora.py

@@ -4,12 +4,12 @@ Tests for ORA (Open Response Assessment) through the LMS UI.
 
 import json
 from bok_choy.promise import fulfill, Promise
-from ..edxapp_pages.studio.auto_auth import AutoAuthPage
-from ..edxapp_pages.lms.course_info import CourseInfoPage
-from ..edxapp_pages.lms.tab_nav import TabNavPage
-from ..edxapp_pages.lms.course_nav import CourseNavPage
-from ..edxapp_pages.lms.open_response import OpenResponsePage
-from ..edxapp_pages.lms.progress import ProgressPage
+from ..pages.studio.auto_auth import AutoAuthPage
+from ..pages.lms.course_info import CourseInfoPage
+from ..pages.lms.tab_nav import TabNavPage
+from ..pages.lms.course_nav import CourseNavPage
+from ..pages.lms.open_response import OpenResponsePage
+from ..pages.lms.progress import ProgressPage
 from ..fixtures.course import XBlockFixtureDesc, CourseFixture
 from ..fixtures.xqueue import XQueueResponseFixture
 

common/test/acceptance/tests/test_studio.py

@@ -3,23 +3,23 @@ Acceptance tests for Studio.
 """
 from bok_choy.web_app_test import WebAppTest
 
-from ..edxapp_pages.studio.asset_index import AssetIndexPage
-from ..edxapp_pages.studio.auto_auth import AutoAuthPage
-from ..edxapp_pages.studio.checklists import ChecklistsPage
-from ..edxapp_pages.studio.course_import import ImportPage
-from ..edxapp_pages.studio.course_info import CourseUpdatesPage
-from ..edxapp_pages.studio.edit_tabs import StaticPagesPage
-from ..edxapp_pages.studio.export import ExportPage
-from ..edxapp_pages.studio.howitworks import HowitworksPage
-from ..edxapp_pages.studio.index import DashboardPage
-from ..edxapp_pages.studio.login import LoginPage
-from ..edxapp_pages.studio.manage_users import CourseTeamPage
-from ..edxapp_pages.studio.overview import CourseOutlinePage
-from ..edxapp_pages.studio.settings import SettingsPage
-from ..edxapp_pages.studio.settings_advanced import AdvancedSettingsPage
-from ..edxapp_pages.studio.settings_graders import GradingPage
-from ..edxapp_pages.studio.signup import SignupPage
-from ..edxapp_pages.studio.textbooks import TextbooksPage
+from ..pages.studio.asset_index import AssetIndexPage
+from ..pages.studio.auto_auth import AutoAuthPage
+from ..pages.studio.checklists import ChecklistsPage
+from ..pages.studio.course_import import ImportPage
+from ..pages.studio.course_info import CourseUpdatesPage
+from ..pages.studio.edit_tabs import StaticPagesPage
+from ..pages.studio.export import ExportPage
+from ..pages.studio.howitworks import HowitworksPage
+from ..pages.studio.index import DashboardPage
+from ..pages.studio.login import LoginPage
+from ..pages.studio.manage_users import CourseTeamPage
+from ..pages.studio.overview import CourseOutlinePage
+from ..pages.studio.settings import SettingsPage
+from ..pages.studio.settings_advanced import AdvancedSettingsPage
+from ..pages.studio.settings_graders import GradingPage
+from ..pages.studio.signup import SignupPage
+from ..pages.studio.textbooks import TextbooksPage
 from ..fixtures.course import CourseFixture
 
 from .helpers import UniqueCourseTest