Merge pull request #881 from edx/christina/ora-e

Ora -e

MANIFEST.in

-include requirements/*.txt
-recursive-include apps/openassessment/templates *.html
-recursive-include apps/openassessment/xblock/static *
-recursive-include apps/openassessment/locale *.po
-recursive-include apps/openassessment/locale *.mo
 include LICENSE
 include AUTHORS
 include README.rst
+include openassessment/xblock/static/css/*.css
+include openassessment/xblock/static/js/openassessment*.min.js
+recursive-include openassessment/xblock/static/js/src *.js
+recursive-include openassessment/templates *.html
+recursive-include openassessment/locale *.po
+recursive-include openassessment/locale *.mo
+global-exclude */test*
+global-exclude */test?/*

setup.py

 #!/usr/bin/env python
-from setuptools import setup
-
-PACKAGES = [
-    'openassessment',
-    'openassessment.assessment',
-    'openassessment.assessment.api',
-    'openassessment.assessment.errors',
-    'openassessment.assessment.models',
-    'openassessment.assessment.serializers',
-    'openassessment.assessment.worker',
-    'openassessment.fileupload',
-    'openassessment.fileupload.backends',
-    'openassessment.workflow',
-    'openassessment.management',
-    'openassessment.xblock'
-]
+from setuptools import setup, find_packages
 
 def is_requirement(line):
     """
@@ -47,7 +32,7 @@ def load_requirements(*requirements_paths):
     return list(requirements)
 
 setup(
-    name='ora2',
+    name='edx-ora2',
     version='0.2.8',
     author='edX',
     url='http://github.com/edx/edx-ora2',
@@ -60,7 +45,8 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
     ],
-    packages=PACKAGES,
+    packages=find_packages(exclude=['*.test', '*.tests']),
+    include_package_data=True,
     install_requires=load_requirements('requirements/base.txt', 'requirements/wheels.txt'),
     tests_require=load_requirements('requirements/test.txt'),
     entry_points={

test/acceptance/pages.py

@@ -5,7 +5,7 @@ Page objects for UI-level acceptance tests.
 import os
 
 from bok_choy.page_object import PageObject
-from bok_choy.promise import EmptyPromise
+from bok_choy.promise import EmptyPromise, BrokenPromise
 
 ORA_SANDBOX_URL = os.environ.get('ORA_SANDBOX_URL')
 
@@ -411,7 +411,14 @@ class GradePage(OpenAssessmentPage):
         Raises:
             ValueError if the score is not an integer.
         """
-        score_candidates = [int(x) for x in self.q(css=self._bounded_selector(".grade__value__earned")).text]
+        earned_selector = self._bounded_selector(".grade__value__earned")
+        score_candidates = []
+        try:
+            self.wait_for_element_visibility(earned_selector, "Earned score was visible", 2)
+            score_candidates = [int(x) for x in self.q(css=earned_selector).text]
+        except BrokenPromise:
+            # Sometimes there is no score, and that's expected.
+            pass
         return score_candidates[0] if len(score_candidates) > 0 else None
 
     def grade_entry(self, question, column):
@@ -481,7 +488,9 @@ class StaffAreaPage(OpenAssessmentPage, AssessmentMixin):
         """
         # Disable JQuery animations (for slideUp/slideDown).
         self.browser.execute_script("jQuery.fx.off = true;")
-        buttons = self.q(css=self._bounded_selector(".button-{button_name}".format(button_name=button_name)))
+        button_selector = self._bounded_selector(".button-{button_name}".format(button_name=button_name))
+        self.wait_for_element_visibility(button_selector, "Button {} is present".format(button_name))
+        buttons = self.q(css=button_selector)
         buttons.first.click()
 
     def click_staff_panel_close_button(self, panel_name):