Merge pull request openedx#408

* stv/revert/cohorts:
  Revert "Move studio dialog code into common"

cms/djangoapps/contentstore/features/common.py

@@ -92,7 +92,7 @@ def press_the_notification_button(_step, name):
     # the "Save" button at the UI level.
     # Instead, we use JavaScript to reliably click
     # the button.
-    btn_css = 'div#page-notification button.action-%s' % name.lower()
+    btn_css = 'div#page-notification a.action-%s' % name.lower()
     world.trigger_event(btn_css, event='focus')
     world.browser.execute_script("$('{}').click()".format(btn_css))
     world.wait_for_ajax_complete()
@@ -284,7 +284,7 @@ def button_disabled(step, value):
 def _do_studio_prompt_action(intent, action):
     """
     Wait for a studio prompt to appear and press the specified action button
-    See common/js/components/views/feedback_prompt.js for implementation
+    See cms/static/js/views/feedback_prompt.js for implementation
     """
     assert intent in [
         'warning',
@@ -299,7 +299,7 @@ def _do_studio_prompt_action(intent, action):
 
     world.wait_for_present('div.wrapper-prompt.is-shown#prompt-{}'.format(intent))
 
-    action_css = 'li.nav-item > button.action-{}'.format(action)
+    action_css = 'li.nav-item > a.action-{}'.format(action)
     world.trigger_event(action_css, event='focus')
     world.browser.execute_script("$('{}').click()".format(action_css))
 

cms/djangoapps/contentstore/features/component.py

@@ -97,7 +97,7 @@ def delete_components(step, number):
     world.wait_for_xmodule()
     delete_btn_css = 'a.delete-button'
     prompt_css = 'div#prompt-warning'
-    btn_css = '{} button.action-primary'.format(prompt_css)
+    btn_css = '{} a.button.action-primary'.format(prompt_css)
     saving_mini_css = 'div#page-notification .wrapper-notification-mini'
     for _ in range(int(number)):
         world.css_click(delete_btn_css)

cms/djangoapps/contentstore/features/course-export.py

@@ -49,7 +49,8 @@ def get_an_error_dialog(step):
 
 @step('I can click to go to the unit with the error$')
 def i_click_on_error_dialog(step):
-    world.css_click("button.action-primary")
+    world.wait_for_visible(".button.action-primary")
+    world.click_link_by_text('Correct failed component')
 
     problem_string = unicode(world.scenario_dict['COURSE'].id.make_usage_key("problem", 'ignore'))
     problem_string = u"Problem {}".format(problem_string[:problem_string.rfind('ignore')])

cms/djangoapps/contentstore/features/course-outline.py

@@ -75,7 +75,7 @@ def i_press_the_section_delete_icon(step):
 
 @step(u'I will confirm all alerts')
 def i_confirm_all_alerts(step):
-    confirm_locator = '.prompt .nav-actions button.action-primary'
+    confirm_locator = '.prompt .nav-actions a.action-primary'
     world.css_click(confirm_locator)
 
 

cms/static/coffee/spec/main.coffee

@@ -220,6 +220,7 @@ define([
     "coffee/spec/models/settings_grading_spec", "coffee/spec/models/textbook_spec",
     "coffee/spec/models/upload_spec",
 
+    "coffee/spec/views/course_info_spec", "coffee/spec/views/feedback_spec",
     "coffee/spec/views/metadata_edit_spec", "coffee/spec/views/module_edit_spec",
     "coffee/spec/views/textbook_spec", "coffee/spec/views/upload_spec",
 
@@ -253,6 +254,8 @@ define([
     "js/spec/views/license_spec",
     "js/spec/views/paging_spec",
 
+    "js/spec/views/utils/view_utils_spec",
+
     "js/spec/views/pages/container_spec",
     "js/spec/views/pages/container_subviews_spec",
     "js/spec/views/pages/group_configurations_spec",

cms/static/coffee/spec/main_spec.coffee

@@ -21,8 +21,10 @@ require ["jquery", "backbone", "coffee/src/main", "common/js/spec_helpers/ajax_h
             expect($.ajaxSettings.headers["X-CSRFToken"]).toEqual("stubCSRFToken")
 
     describe "AJAX Errors", ->
+        tpl = readFixtures('system-feedback.underscore')
 
         beforeEach ->
+            setFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(tpl))
             appendSetFixtures(sandbox({id: "page-notification"}))
 
         it "successful AJAX request does not pop an error notification", ->

cms/static/coffee/spec/views/assets_spec.coffee

@@ -1,12 +1,14 @@
 define ["jquery", "jasmine", "common/js/spec_helpers/ajax_helpers", "squire"],
 ($, jasmine, AjaxHelpers, Squire) ->
 
+    feedbackTpl = readFixtures('system-feedback.underscore')
     assetLibraryTpl = readFixtures('asset-library.underscore')
     assetTpl = readFixtures('asset.underscore')
 
     describe "Asset view", ->
         beforeEach ->
             setFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl))
+            appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
             appendSetFixtures(sandbox({id: "page-prompt"}))
 
             @promptSpies = jasmine.createSpyObj('Prompt.Warning', ["constructor", "show", "hide"])
@@ -22,10 +24,10 @@ define ["jquery", "jasmine", "common/js/spec_helpers/ajax_helpers", "squire"],
             @savingSpies.show.andReturn(@savingSpies)
 
             @injector = new Squire()
-            @injector.mock("common/js/components/views/feedback_prompt", {
+            @injector.mock("js/views/feedback_prompt", {
                 "Warning": @promptSpies.constructor
             })
-            @injector.mock("common/js/components/views/feedback_notification", {
+            @injector.mock("js/views/feedback_notification", {
                 "Confirmation": @confirmationSpies.constructor,
                 "Mini": @savingSpies.constructor
             })
@@ -137,6 +139,7 @@ define ["jquery", "jasmine", "common/js/spec_helpers/ajax_helpers", "squire"],
         beforeEach ->
             setFixtures($("<script>", {id: "asset-library-tpl", type: "text/template"}).text(assetLibraryTpl))
             appendSetFixtures($("<script>", {id: "asset-tpl", type: "text/template"}).text(assetTpl))
+            appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
             window.analytics = jasmine.createSpyObj('analytics', ['track'])
             window.course_location_analytics = jasmine.createSpy()
             appendSetFixtures(sandbox({id: "asset_table_body"}))
@@ -146,7 +149,7 @@ define ["jquery", "jasmine", "common/js/spec_helpers/ajax_helpers", "squire"],
             @promptSpies.show.andReturn(@promptSpies)
 
             @injector = new Squire()
-            @injector.mock("common/js/components/views/feedback_prompt", {
+            @injector.mock("js/views/feedback_prompt", {
                 "Warning": @promptSpies.constructor
             })
 

cms/static/coffee/spec/views/textbook_spec.coffee

@@ -1,9 +1,9 @@
 define ["js/models/textbook", "js/models/chapter", "js/collections/chapter", "js/models/course",
     "js/collections/textbook", "js/views/show_textbook", "js/views/edit_textbook", "js/views/list_textbooks",
-    "js/views/edit_chapter", "common/js/components/views/feedback_prompt",
-    "common/js/components/views/feedback_notification", "common/js/components/utils/view_utils","common/js/spec_helpers/ajax_helpers",
-    "js/spec_helpers/modal_helpers", "jasmine-stealth"],
+    "js/views/edit_chapter", "js/views/feedback_prompt", "js/views/feedback_notification", "js/views/utils/view_utils",
+    "common/js/spec_helpers/ajax_helpers", "js/spec_helpers/modal_helpers", "jasmine-stealth"],
 (Textbook, Chapter, ChapterSet, Course, TextbookSet, ShowTextbook, EditTextbook, ListTextbooks, EditChapter, Prompt, Notification, ViewUtils, AjaxHelpers, modal_helpers) ->
+    feedbackTpl = readFixtures('system-feedback.underscore')
 
     beforeEach ->
         # remove this when we upgrade jasmine-jquery
@@ -20,6 +20,7 @@ define ["js/models/textbook", "js/models/chapter", "js/collections/chapter", "js
 
         beforeEach ->
             setFixtures($("<script>", {id: "show-textbook-tpl", type: "text/template"}).text(tpl))
+            appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
             appendSetFixtures(sandbox({id: "page-notification"}))
             appendSetFixtures(sandbox({id: "page-prompt"}))
             @model = new Textbook({name: "Life Sciences", id: "0life-sciences"})
@@ -109,6 +110,7 @@ define ["js/models/textbook", "js/models/chapter", "js/collections/chapter", "js
             beforeEach ->
                 setFixtures($("<script>", {id: "edit-textbook-tpl", type: "text/template"}).text(tpl))
                 appendSetFixtures($("<script>", {id: "edit-chapter-tpl", type: "text/template"}).text(chapterTpl))
+                appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
                 appendSetFixtures(sandbox({id: "page-notification"}))
                 appendSetFixtures(sandbox({id: "page-prompt"}))
                 @model = new Textbook({name: "Life Sciences", editing: true})
@@ -230,6 +232,7 @@ define ["js/models/textbook", "js/models/chapter", "js/collections/chapter", "js
 #
 #        beforeEach ->
 #            setFixtures($("<script>", {id: "no-textbooks-tpl", type: "text/template"}).text(noTextbooksTpl))
+#            appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
 #            @showSpies = spyOnConstructor("ShowTextbook", ["render"])
 #            @showSpies.render.andReturn(@showSpies) # equivalent of `return this`
 #            showEl = $("<li>")

cms/static/coffee/spec/views/upload_spec.coffee

@@ -1,5 +1,7 @@
 define ["js/models/uploads", "js/views/uploads", "js/models/chapter", "common/js/spec_helpers/ajax_helpers", "js/spec_helpers/modal_helpers"], (FileUpload, UploadDialog, Chapter, AjaxHelpers, modal_helpers) ->
 
+    feedbackTpl = readFixtures('system-feedback.underscore')
+
     describe "UploadDialog", ->
         tpl = readFixtures("upload-dialog.underscore")
 

cms/static/coffee/src/main.coffee

@@ -1,5 +1,5 @@
 define ["domReady", "jquery", "underscore.string", "backbone", "gettext",
-        "common/js/components/views/feedback_notification",
+        "js/views/feedback_notification",
         "coffee/src/ajax_prefix", "jquery.cookie"],
 (domReady, $, str, Backbone, gettext, NotificationView) ->
   main = ->

cms/static/coffee/src/views/tabs.coffee

@@ -1,5 +1,5 @@
-define ["jquery", "jquery.ui", "backbone", "common/js/components/views/feedback_prompt",
-        "common/js/components/views/feedback_notification", "coffee/src/views/module_edit", "js/models/module_info", "js/utils/module"],
+define ["jquery", "jquery.ui", "backbone", "js/views/feedback_prompt", "js/views/feedback_notification",
+    "coffee/src/views/module_edit", "js/models/module_info", "js/utils/module"],
 ($, ui, Backbone, PromptView, NotificationView, ModuleEditView, ModuleModel, ModuleUtils) ->
   class TabsEdit extends Backbone.View
 

cms/static/coffee/src/xblock/cms.runtime.v1.coffee

@@ -1,6 +1,6 @@
 define [
     "jquery", "backbone", "xblock/runtime.v1", "URI", "gettext",
-    "js/utils/modal", "common/js/components/views/feedback_notification"
+    "js/utils/modal", "js/views/feedback_notification"
 ], ($, Backbone, XBlock, URI, gettext, ModalUtils, NotificationView) ->
 
     @BaseRuntime = {}

cms/static/js/base.js

@@ -1,7 +1,6 @@
-require(["domReady", "jquery", "underscore", "gettext", "common/js/components/views/feedback_notification",
-        "common/js/components/views/feedback_prompt", "js/utils/date_utils",
-        "js/utils/module", "js/utils/handle_iframe_binding", "jquery.ui", "jquery.leanModal",
-        "jquery.form", "jquery.smoothScroll"],
+require(["domReady", "jquery", "underscore", "gettext", "js/views/feedback_notification", "js/views/feedback_prompt",
+    "js/utils/date_utils", "js/utils/module", "js/utils/handle_iframe_binding",
+    "jquery.ui", "jquery.leanModal", "jquery.form", "jquery.smoothScroll"],
     function(domReady, $, _, gettext, NotificationView, PromptView, DateUtils, ModuleUtils, IframeUtils)
 {
 

cms/static/js/certificates/spec/views/certificate_details_spec.js

@@ -7,10 +7,10 @@ define([ // jshint ignore:line
     'js/certificates/models/certificate',
     'js/certificates/views/certificate_details',
     'js/certificates/views/certificate_preview',
-    'common/js/components/views/feedback_notification',
+    'js/views/feedback_notification',
     'common/js/spec_helpers/ajax_helpers',
     'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers',
+    'js/spec_helpers/view_helpers',
     'js/spec_helpers/validation_helpers',
     'js/certificates/spec/custom_matchers'
 ],

cms/static/js/certificates/spec/views/certificate_editor_spec.js

@@ -7,10 +7,10 @@ define([ // jshint ignore:line
     'js/certificates/models/signatory',
     'js/certificates/collections/certificates',
     'js/certificates/views/certificate_editor',
-    'common/js/components/views/feedback_notification',
+    'js/views/feedback_notification',
     'common/js/spec_helpers/ajax_helpers',
     'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers',
+    'js/spec_helpers/view_helpers',
     'js/spec_helpers/validation_helpers',
     'js/certificates/spec/custom_matchers'
 ],

cms/static/js/certificates/spec/views/certificate_preview_spec.js

@@ -6,7 +6,7 @@ define([ // jshint ignore:line
     'js/models/course',
     'js/certificates/views/certificate_preview',
     'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers',
+    'js/spec_helpers/view_helpers',
     'common/js/spec_helpers/ajax_helpers'
 ],
 function(_, $, Course, CertificatePreview, TemplateHelpers, ViewHelpers, AjaxHelpers) {

cms/static/js/certificates/spec/views/certificates_list_spec.js

@@ -10,7 +10,7 @@ define([ // jshint ignore:line
     'js/certificates/views/certificate_item',
     'js/certificates/views/certificates_list',
     'js/certificates/views/certificate_preview',
-    'common/js/components/views/feedback_notification',
+    'js/views/feedback_notification',
     'common/js/spec_helpers/ajax_helpers',
     'common/js/spec_helpers/template_helpers',
     'js/certificates/spec/custom_matchers'

cms/static/js/certificates/views/certificate_details.js

@@ -8,7 +8,7 @@ define([ // jshint ignore:line
     'js/views/baseview',
     'js/certificates/models/signatory',
     'js/certificates/views/signatory_details',
-    'common/js/components/utils/view_utils'
+    'js/views/utils/view_utils'
 ],
 function($, _, str, gettext, BaseView, SignatoryModel, SignatoryDetailsView, ViewUtils) {
     'use strict';

cms/static/js/certificates/views/certificate_preview.js

@@ -6,8 +6,8 @@ define([ // jshint ignore:line
     'underscore',
     'gettext',
     'js/views/baseview',
-    'common/js/components/utils/view_utils',
-    'common/js/components/views/feedback_notification'
+    'js/views/utils/view_utils',
+    'js/views/feedback_notification'
 ],
 function(_, gettext, BaseView, ViewUtils, NotificationView) {
     'use strict';

cms/static/js/certificates/views/signatory_details.js

@@ -7,7 +7,7 @@ define([ // jshint ignore:line
     'backbone',
     'gettext',
     'js/utils/templates',
-    'common/js/components/utils/view_utils',
+    'js/views/utils/view_utils',
     'js/views/baseview',
     'js/certificates/views/signatory_editor'
 ],

cms/static/js/certificates/views/signatory_editor.js

@@ -6,9 +6,9 @@ define([ // jshint ignore:line
     'backbone',
     'gettext',
     'js/utils/templates',
-    'common/js/components/utils/view_utils',
-    'common/js/components/views/feedback_prompt',
-    'common/js/components/views/feedback_notification',
+    'js/views/utils/view_utils',
+    'js/views/feedback_prompt',
+    'js/views/feedback_notification',
     'js/models/uploads',
     'js/views/uploads'
 ],

cms/static/js/factories/export.js

@@ -1,4 +1,4 @@
-define(['gettext', 'common/js/components/views/feedback_prompt'], function(gettext, PromptView) {
+define(['gettext', 'js/views/feedback_prompt'], function(gettext, PromptView) {
     'use strict';
     return function (hasUnit, editUnitUrl, courselikeHomeUrl, library, errMsg) {
         var dialog;

cms/static/js/index.js

@@ -1,5 +1,5 @@
 define(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape", "js/views/utils/create_course_utils",
-    "js/views/utils/create_library_utils", "common/js/components/utils/view_utils"],
+    "js/views/utils/create_library_utils", "js/views/utils/view_utils"],
     function (domReady, $, _, CancelOnEscape, CreateCourseUtilsFactory, CreateLibraryUtilsFactory, ViewUtils) {
         "use strict";
         var CreateCourseUtils = new CreateCourseUtilsFactory({

cms/static/js/models/section.js

@@ -1,4 +1,4 @@
-define(["backbone", "gettext", "common/js/components/views/feedback_notification", "js/utils/module"],
+define(["backbone", "gettext", "js/views/feedback_notification", "js/utils/module"],
     function(Backbone, gettext, NotificationView, ModuleUtils) {
 
     var Section = Backbone.Model.extend({

cms/static/js/spec/utils/drag_and_drop_spec.js

@@ -1,4 +1,4 @@
-define(["js/utils/drag_and_drop", "common/js/components/views/feedback_notification", "common/js/spec_helpers/ajax_helpers", "jquery", "underscore"],
+define(["js/utils/drag_and_drop", "js/views/feedback_notification", "common/js/spec_helpers/ajax_helpers", "jquery", "underscore"],
     function (ContentDragger, Notification, AjaxHelpers, $, _) {
         describe("Overview drag and drop functionality", function () {
             beforeEach(function () {

cms/static/js/spec/video/file_uploader_editor_spec.js

@@ -12,6 +12,7 @@ function ($, _, Squire) {
                 'metadata-file-uploader-item.underscore'
             ),
             locator = 'locator',
+            feedbackTpl = readFixtures('system-feedback.underscore'),
             modelStub = {
                 default_value: 'http://example.org/test_1',
                 display_name: 'File Upload',

cms/static/js/spec/video/translations_editor_spec.js

@@ -12,6 +12,7 @@ function ($, _, Squire) {
             TranslationsItenTemplate = readFixtures(
                 'video/metadata-translations-item.underscore'
             ),
+            feedbackTpl = readFixtures('system-feedback.underscore'),
             modelStub = {
                 default_value: {
                     'en': 'en.srt',

cms/static/js/spec/views/assets_spec.js

@@ -1,5 +1,5 @@
 define([ "jquery", "common/js/spec_helpers/ajax_helpers", "URI", "js/views/assets",
-         "js/collections/asset", "common/js/spec_helpers/view_helpers"],
+         "js/collections/asset", "js/spec_helpers/view_helpers"],
     function ($, AjaxHelpers, URI, AssetsView, AssetCollection, ViewHelpers) {
 
         describe("Assets", function() {

cms/static/js/spec/views/group_configuration_spec.js

@@ -4,8 +4,8 @@ define([
     'js/views/group_configuration_details', 'js/views/group_configurations_list', 'js/views/group_configuration_editor',
     'js/views/group_configuration_item', 'js/views/experiment_group_edit', 'js/views/content_group_list',
     'js/views/content_group_details', 'js/views/content_group_editor', 'js/views/content_group_item',
-    'common/js/components/views/feedback_notification', 'common/js/spec_helpers/ajax_helpers', 'common/js/spec_helpers/template_helpers',
-    'common/js/spec_helpers/view_helpers', 'jasmine-stealth'
+    'js/views/feedback_notification', 'common/js/spec_helpers/ajax_helpers', 'common/js/spec_helpers/template_helpers',
+    'js/spec_helpers/view_helpers', 'jasmine-stealth'
 ], function(
     _, Course, GroupConfigurationModel, GroupModel, GroupConfigurationCollection, GroupCollection,
     GroupConfigurationDetailsView, GroupConfigurationsListView, GroupConfigurationEditorView,

cms/static/js/spec/views/paged_container_spec.js

@@ -75,6 +75,8 @@ define(["jquery", "underscore", "common/js/spec_helpers/ajax_helpers", "URI", "j
             var pagingContainer;
 
             beforeEach(function () {
+                var feedbackTpl = readFixtures('system-feedback.underscore');
+                setFixtures($("<script>", { id: "system-feedback-tpl", type: "text/template" }).text(feedbackTpl));
                 pagingContainer = new MockPagingView({page_size: PAGE_SIZE});
             });
 

cms/static/js/spec/views/pages/container_subviews_spec.js

@@ -1,7 +1,7 @@
 define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/ajax_helpers",
         "common/js/spec_helpers/template_helpers", "js/spec_helpers/edit_helpers",
-        "common/js/components/views/feedback_prompt", "js/views/pages/container",
-        "js/views/pages/container_subviews", "js/models/xblock_info", "js/views/utils/xblock_utils"],
+        "js/views/feedback_prompt", "js/views/pages/container", "js/views/pages/container_subviews",
+        "js/models/xblock_info", "js/views/utils/xblock_utils"],
     function ($, _, str, AjaxHelpers, TemplateHelpers, EditHelpers, Prompt, ContainerPage, ContainerSubviews,
               XBlockInfo, XBlockUtils) {
         var VisibilityState = XBlockUtils.VisibilityState;

cms/static/js/spec/views/pages/course_outline_spec.js

@@ -1,4 +1,4 @@
-define(["jquery", "common/js/spec_helpers/ajax_helpers", "common/js/components/utils/view_utils", "js/views/pages/course_outline",
+define(["jquery", "common/js/spec_helpers/ajax_helpers", "js/views/utils/view_utils", "js/views/pages/course_outline",
         "js/models/xblock_outline_info", "js/utils/date_utils", "js/spec_helpers/edit_helpers",
         "common/js/spec_helpers/template_helpers"],
     function($, AjaxHelpers, ViewUtils, CourseOutlinePage, XBlockOutlineInfo, DateUtils, EditHelpers, TemplateHelpers) {