Commit fca500fc by Jesse Zoldak

[fixup] with the asset page object working

parent f951e3b5
...@@ -12,11 +12,9 @@ from bok_choy.javascript import wait_for_js, requirejs ...@@ -12,11 +12,9 @@ from bok_choy.javascript import wait_for_js, requirejs
@requirejs('js/factories/asset_index') @requirejs('js/factories/asset_index')
class AssetIndexPage(CoursePage): class AssetIndexPage(CoursePage):
""" """
The Files and Uploads page for a course in Studio The Files and Uploads page for a course in Studio
""" """
url_path = "assets" url_path = "assets"
type_filter_element = '#js-asset-type-col' type_filter_element = '#js-asset-type-col'
...@@ -40,7 +38,7 @@ class AssetIndexPage(CoursePage): ...@@ -40,7 +38,7 @@ class AssetIndexPage(CoursePage):
def is_browser_on_page(self): def is_browser_on_page(self):
return all([ return all([
self.q(css='body.view-uploads').present, self.q(css='body.view-uploads').present,
self.q(css='page-header').present, self.q(css='.page-header').present,
not self.q(css='div.ui-loading').visible, not self.q(css='div.ui-loading').visible,
]) ])
......
...@@ -16,10 +16,6 @@ class AssetIndexTest(StudioCourseTest): ...@@ -16,10 +16,6 @@ class AssetIndexTest(StudioCourseTest):
Tests for the Asset index page. Tests for the Asset index page.
""" """
def setUp(self, is_staff=False): def setUp(self, is_staff=False):
# TODO: visit fails under phantom.
# Probably same root cause as the flakiness.
assert False, "Visiting the asset page fails in phantomjs"
super(AssetIndexTest, self).setUp() super(AssetIndexTest, self).setUp()
self.asset_page = AssetIndexPage( self.asset_page = AssetIndexPage(
self.browser, self.browser,
...@@ -40,7 +36,6 @@ class AssetIndexTest(StudioCourseTest): ...@@ -40,7 +36,6 @@ class AssetIndexTest(StudioCourseTest):
""" """
self.asset_page.visit() self.asset_page.visit()
@flaky # TODO fix this, see SOL-1160
def test_type_filter_exists(self): def test_type_filter_exists(self):
""" """
Make sure type filter is on the page. Make sure type filter is on the page.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment