From b858810aa40647a3465b0752f8100ea6d49fc7db Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 12 Sep 2013 11:07:07 +0300
Subject: [PATCH] Updating LTI Jasmine tests.

Due to the fact that by default the LTI settings have "http://www.example.com"
set as the default form action (launch_url), tests were updated to reflect the
fact that when setting is in default state, form is not submited, even when
the form action is not empty.
---
 .../lib/xmodule/xmodule/js/fixtures/lti.html  | 38 +++++++++----------
 .../xmodule/js/spec/lti/constructor.js        |  4 +-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/fixtures/lti.html b/common/lib/xmodule/xmodule/js/fixtures/lti.html
index e5e7ab3f3f..ae545970ce 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/lti.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/lti.html
@@ -1,27 +1,27 @@
 <div id="lti_id" class="lti">
 
     <form
-        action=""
+        action="http://www.example.com"
         name="ltiLaunchForm"
         class="ltiLaunchForm"
         method="post"
         target="ltiLaunchFrame"
-        encType="application/x-www-form-urlencoded"
+        enctype="application/x-www-form-urlencoded"
     >
-
-        <input type="hidden" name="launch_presentation_return_url" value="">
-        <input type="hidden" name="lis_outcome_service_url" value="">
-        <input type="hidden" name="lis_result_sourcedid" value="">
-        <input type="hidden" name="lti_message_type" value="basic-lti-launch-request">
-        <input type="hidden" name="lti_version" value="LTI-1p0">
-        <input type="hidden" name="oauth_callback" value="about:blank">
-        <input type="hidden" name="oauth_consumer_key" value=""/>
-        <input type="hidden" name="oauth_nonce" value=""/>
-        <input type="hidden" name="oauth_signature_method" value="HMAC-SHA1"/>
-        <input type="hidden" name="oauth_timestamp" value=""/>
-        <input type="hidden" name="oauth_version" value="1.0"/>
-        <input type="hidden" name="user_id" value="default_user_id">
-        <input type="hidden" name="oauth_signature" value=""/>
+        <input name="launch_presentation_return_url" value="" />
+        <input name="lti_version" value="LTI-1p0" />
+        <input name="user_id" value="student" />
+        <input name="oauth_nonce" value="28347958723982798572" />
+        <input name="oauth_timestamp" value="2389479832" />
+        <input name="oauth_consumer_key" value="" />
+        <input name="lis_result_sourcedid" value="" />
+        <input name="oauth_signature_method" value="HMAC-SHA1" />
+        <input name="oauth_version" value="1.0" />
+        <input name="role" value="student" />
+        <input name="lis_outcome_service_url" value="" />
+        <input name="oauth_signature" value="89ru3289r3ry283y3r82ryr38yr" />
+        <input name="lti_message_type" value="basic-lti-launch-request" />
+        <input name="oauth_callback" value="about:blank" />
 
         <input type="submit" value="Press to Launch" />
     </form>
@@ -31,10 +31,6 @@
         required fields.
     </h3>
 
-    <iframe
-        name="ltiLaunchFrame"
-        class="ltiLaunchFrame"
-        src=""
-    ></iframe>
+    <iframe name="ltiLaunchFrame" class="ltiLaunchFrame" src=""></iframe>
 
 </div>
diff --git a/common/lib/xmodule/xmodule/js/spec/lti/constructor.js b/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
index 0a73496bed..f016d42d9d 100644
--- a/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
+++ b/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
@@ -46,7 +46,7 @@
                 });
 
                 it(
-                    'when URL setting is filled form is not submited',
+                    'when URL setting is not filled form is not submited',
                     function () {
 
                     expect('submit').not.toHaveBeenTriggeredOn(form);
@@ -70,7 +70,7 @@
 
                     // The user "fills in" the necessary settings, and the
                     // form will get an action URL.
-                    form.attr('action', 'http://www.example.com/');
+                    form.attr('action', 'http://www.example.com/test_submit');
 
                     LTI(element);
                 });