Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2603 from cpennington/xblock-acid-resources-test

Browse Source 
Add tests of local_resource_url
This commit is contained in:
Calen Pennington
2014-02-25 16:46:10 -05:00
parent 89b0c30fa9 c72d410083
commit a2137cec35
21 changed files with 160 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/test/acceptance/pages/xblock/acid.py
View File

@@ -25,10 +25,7 @@ class AcidView(PageObject):
self.context_selector = context_selector
def is_browser_on_page(self):
return (
self.is_css_present('{} .acid-block'.format(self.context_selector)) and
self.browser.evaluate_script("$({!r}).data('initialized')".format(self.context_selector))
)
return self.is_css_present('{}.xblock-initialized .acid-block'.format(self.context_selector))
def test_passed(self, test_selector):
"""
@@ -44,13 +41,6 @@ class AcidView(PageObject):
"""
return self.test_passed('.js-init-run')
@property
def doc_ready_passed(self):
"""
Whether the document-ready test passed in this view of the :class:`.AcidBlock`.
"""
return self.test_passed('.document-ready-run')
@property
def child_tests_passed(self):
"""
@@ -61,6 +51,13 @@ class AcidView(PageObject):
self.test_passed('.child-values-match')
])
@property
def resource_url_passed(self):
"""
Whether the resource-url test passed in this view of the :class:`.AcidBlock`.
"""
return self.test_passed('.local-resource-test')
def scope_passed(self, scope):
return all(
self.test_passed('.scope-storage-test.scope-{} {}'.format(scope, test))

5
common/test/acceptance/tests/test_lms.py
View File

@@ -369,9 +369,12 @@ class XBlockAcidBase(UniqueCourseTest):
acid_block = AcidView(self.browser, '.xblock-student_view[data-block-type=acid]')
self.assertTrue(acid_block.init_fn_passed)
self.assertTrue(acid_block.doc_ready_passed)
self.assertTrue(acid_block.child_tests_passed)
self.assertTrue(acid_block.resource_url_passed)
self.assertTrue(acid_block.scope_passed('user_state'))
self.assertTrue(acid_block.scope_passed('user_state_summary'))
self.assertTrue(acid_block.scope_passed('preferences'))
self.assertTrue(acid_block.scope_passed('user_info'))
class XBlockAcidNoChildTest(XBlockAcidBase):

7
common/test/acceptance/tests/test_studio.py
View File

@@ -157,9 +157,12 @@ class XBlockAcidBase(WebAppTest):
acid_block = AcidView(self.browser, unit.components[0].preview_selector)
self.assertTrue(acid_block.init_fn_passed)
self.assertTrue(acid_block.doc_ready_passed)
self.assertTrue(acid_block.child_tests_passed)
self.assertTrue(acid_block.resource_url_passed)
self.assertTrue(acid_block.scope_passed('user_state'))
self.assertTrue(acid_block.scope_passed('user_state_summary'))
self.assertTrue(acid_block.scope_passed('preferences'))
self.assertTrue(acid_block.scope_passed('user_info'))
def test_acid_block_editor(self):
"""
@@ -173,8 +176,8 @@ class XBlockAcidBase(WebAppTest):
acid_block = AcidView(self.browser, unit.components[0].edit().editor_selector)
self.assertTrue(acid_block.init_fn_passed)
self.assertTrue(acid_block.doc_ready_passed)
self.assertTrue(acid_block.child_tests_passed)
self.assertTrue(acid_block.resource_url_passed)
self.assertTrue(acid_block.scope_passed('content'))
self.assertTrue(acid_block.scope_passed('settings'))