Landing pull request 331. Add support for registering jQuery as an AMD module. Fixes #7102.

More Details:
 - https://github.com/jquery/jquery/pull/331
 - http://bugs.jquery.com/ticket/7102

2 files changed, 19 insertions, 1 deletions

diff --git a/test/data/testinit.js b/test/data/testinit.js
index c30747d09..7d566faa5 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -1,7 +1,19 @@
 var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
 	$ = this.$ || "$",
 	originaljQuery = jQuery,
-	original$ = $;
+	original$ = $,
+        amdDefined;
+
+/**
+ * Set up a mock AMD define function for testing AMD registration.
+ */
+function define(name, dependencies, callback) {
+	amdDefined = callback();
+}
+
+define.amd = {
+	jQuery: true
+};
 
 /**
  * Returns an array of elements with the given IDs, eg.
diff --git a/test/unit/core.js b/test/unit/core.js
index 50157fa48..0f4504a13 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -225,6 +225,12 @@ test("browser", function() {
 });
 }
 
+test("amdModule", function() {
+	expect(1);
+
+	equals( jQuery, amdDefined, "Make sure defined module matches jQuery" );
+});
+
 test("noConflict", function() {
 	expect(7);