From 121c47aa4c528ed27652827f2bf6cba24bc634a8 Mon Sep 17 00:00:00 2001
From: Farhanah Sheets <fsheets@edx.org>
Date: Tue, 1 May 2018 15:13:07 -0400
Subject: [PATCH] Bump studio-frontend to v1.9.4 and fix bokchoy
---
common/test/acceptance/pages/studio/asset_index.py | 13 ++++++++-----
package-lock.json | 14 +++++++-------
package.json | 2 +-
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/common/test/acceptance/pages/studio/asset_index.py b/common/test/acceptance/pages/studio/asset_index.py
index cb5bb90ba60..827f8d5a27a 100644
--- a/common/test/acceptance/pages/studio/asset_index.py
+++ b/common/test/acceptance/pages/studio/asset_index.py
@@ -250,18 +250,21 @@ class AssetIndexPageStudioFrontend(CoursePage):
Arguments:
file_names (list): file name(s) we want to upload.
"""
-
- # Make file input field visible.
file_input_css = 'input[type=file]'
- self.browser.execute_script('$("{}").css("display","block");'.format(file_input_css))
for file_name in file_names:
+ # Make file input field visible.
+ self.browser.execute_script('$("{}").css("display","block");'.format(file_input_css))
+ self.wait_for_element_visibility(file_input_css, "Input is visible")
+ #Send file to upload
self.q(css=file_input_css).results[0].send_keys(
UPLOAD_FILE_DIR + file_name)
self.q(css=file_input_css).results[0].clear()
+ # Wait for status alert and close
+ self.wait_for_element_visibility(
+ '.alert', 'Upload status alert is visible.')
+ self.q(css='.close').first.click()
- self.wait_for_element_visibility(
- '.alert', 'Upload status alert is visible.')
self.wait_for_ajax()
self.wait_for_files_upload(len(file_names))
diff --git a/package-lock.json b/package-lock.json
index f5faa6993ea..e967f761e38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,12 +86,12 @@
}
},
"@edx/studio-frontend": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-1.8.0.tgz",
- "integrity": "sha512-s58bIlvWFwCoYA/4E8L1sHZ2AdDbP5Gtjbn55NwX8Mwczzuhv8/TETXKxERzyhAXE3+xeJ4bpAuJ7b0uehAJzw==",
+ "version": "1.9.4",
+ "resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-1.9.4.tgz",
+ "integrity": "sha512-bev9ra3L5ADFpuP4lALC0+tGQpIl2AGFdzmQvOgcjObjsLFUQXDATR+MS93XwekUi9vz7NckDtGT4Nz82ky+Pw==",
"requires": {
"@edx/edx-bootstrap": "1.0.0",
- "@edx/paragon": "2.6.1",
+ "@edx/paragon": "2.7.0",
"babel-polyfill": "6.26.0",
"classnames": "2.2.5",
"copy-to-clipboard": "3.0.8",
@@ -127,9 +127,9 @@
}
},
"@edx/paragon": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-2.6.1.tgz",
- "integrity": "sha512-mVtpFUZl/xlT4NHzUM3EMtLyPBR6lkdcnrs7YSC8AOLILij0feL75vByFijL9HxXkNhidaH8XNWe+KPeJ9q81Q==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-2.7.0.tgz",
+ "integrity": "sha512-YbZpn8/84ddsAsh/vWP63Zi9uRTXrvDLVP4ZJqLuQjJhts6OVetXvfWFHON/3fHK4Yvp090xaAWzbpxwJJ88Uw==",
"requires": {
"@edx/edx-bootstrap": "1.0.0",
"babel-polyfill": "6.26.0",
diff --git a/package.json b/package.json
index 8e61c28d0e5..ad63757b6c7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"@edx/cookie-policy-banner": "1.1.6",
"@edx/edx-bootstrap": "0.4.3",
"@edx/paragon": "2.6.4",
- "@edx/studio-frontend": "1.8.0",
+ "@edx/studio-frontend": "1.9.4",
"babel-core": "6.26.0",
"babel-loader": "6.4.1",
"babel-plugin-transform-class-properties": "6.24.1",
--
GitLab