Merge pull request #10193 from edx/christina/move-require-test

Clean up of common JS specs using RequireJS.

common/static/js/spec/main_requirejs.js → common/static/common/js/spec/main_requirejs.js

@@ -162,7 +162,8 @@
         'common-requirejs/include/common/js/spec/components/paging_header_spec.js',
         'common-requirejs/include/common/js/spec/components/paging_footer_spec.js',
         'common-requirejs/include/common/js/spec/components/search_field_spec.js',
-        'common-requirejs/include/common/js/spec/components/view_utils_spec.js'
+        'common-requirejs/include/common/js/spec/components/view_utils_spec.js',
+        'common-requirejs/include/common/js/spec/utils/edx.utils.validate_spec.js'
     ]);
 
 }).call(this, requirejs, define);

common/static/js/spec/edx.utils.validate_spec.js → common/static/common/js/spec/utils/edx.utils.validate_spec.js

 ;(function (define) {
     'use strict';
-    define(['jquery', 'js/utils/edx.utils.validate'],
-        function($) {
+    define(['jquery', 'common/js/utils/edx.utils.validate'],
+        function($, EdxUtilsValidate) {
 
+        describe("EdxUtilsValidate", function() {
             var fixture = null,
                 field = null,
                 result = null,
@@ -31,12 +32,12 @@
             };
 
             var expectValid = function() {
-            result = edx.utils.validate(field);
+                result = EdxUtilsValidate.validate(field);
                 expect(result.isValid).toBe(true);
             };
 
             var expectInvalid = function( errorFragment ) {
-            result = edx.utils.validate(field);
+                result = EdxUtilsValidate.validate(field);
                 expect(result.isValid).toBe(false);
                 expect(result.message).toMatch(errorFragment);
             };
@@ -192,4 +193,5 @@
                 expectInvalid(CUSTOM_MESSAGE);
             });
         });
+    });
 }).call(this, define || RequireJS.define);

common/static/js_test.yml

@@ -48,7 +48,6 @@ src_paths:
     - js/xblock
     - coffee/src
     - js/src
-    - js/utils
     - js/capa/src
 
 # Paths to spec (test) JavaScript files

common/static/js_test_requirejs.yml

@@ -54,7 +54,6 @@ src_paths:
 # Paths to spec (test) JavaScript files
 spec_paths:
     - common/js/spec
-    - js/spec/main_requirejs.js
 
 # Paths to fixture files (optional)
 # The fixture path will be set automatically when using jasmine-jquery.
@@ -70,7 +69,7 @@ fixture_paths:
 
 requirejs:
   paths:
-    main: js/spec/main_requirejs
+    main: common/js/spec/main_requirejs
 
 # Because require.js is responsible for loading all dependencies, we exclude
 # all files from being included in <script> tags

lms/static/js/spec/main.js

@@ -89,7 +89,7 @@
             'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min',
 
             // Common edx utils
-            'js/utils/edx.utils.validate': 'xmodule_js/common_static/js/utils/edx.utils.validate'
+            'common/js/utils/edx.utils.validate': 'xmodule_js/common_static/common/js/utils/edx.utils.validate'
         },
         shim: {
             'gettext': {

lms/static/js/student_account/views/FormView.js

@@ -4,7 +4,7 @@
             'jquery',
             'underscore',
             'backbone',
-            'js/utils/edx.utils.validate'
+            'common/js/utils/edx.utils.validate'
         ],
         function($, _, Backbone, EdxUtilsValidate) {
 

lms/static/js_test.yml

@@ -64,7 +64,7 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/date.js
     - xmodule_js/common_static/js/vendor/moment.min.js
     - xmodule_js/common_static/js/vendor/moment-with-locales.min.js
-    - xmodule_js/common_static/js/utils/edx.utils.validate.js
+    - xmodule_js/common_static/common/js/utils/edx.utils.validate.js
 
 # Paths to source JavaScript files
 src_paths: