Merge pull request #516 from uw-it-aca/fix/MUWM-3796

Fix/muwm 3796

Author: vegitron

myuw/static/js/card/textbook.js

@@ -96,18 +96,19 @@ var TextbookCard = {
         var template = Handlebars.compile(source);
         var raw = template(template_data);
         TextbookCard.dom_target.html(raw);
+        LogUtils.cardLoaded(TextbookCard.name, TextbookCard.dom_target);
+        TextbookCard.add_events(term);
+    },
 
-        $(".show_textbooks").on("click", function(ev) {
+    add_events: function(term) {
+        $("#show_term_textbooks").on("click", function(ev) {
             WSData.log_interaction("card_view_future_textbooks", term);
             var hist = window.History;
             hist.pushState({
                 state: "textbooks",
                 term: term
             },  "", "/textbooks/"+term);
-            return false;
         });
-        LogUtils.cardLoaded(TextbookCard.name, TextbookCard.dom_target);
-
     }
 
 };

myuw/templates/handlebars/card/textbook.html

@@ -25,7 +25,7 @@ <h3>Textbooks</h3>
 
         {{#unless no_book_assigned}}
             <div class="destination-arrow">
-                <a class="show_textbooks" href="/textbooks/{{year}},{{quarter}}{{#if summer_term}},{{toLowerCase summer_term}}{{/if}}" title="View textbooks" aria-label="View textbook details for this quarter" ><i role="presentation" class="fa fa-chevron-right"></i></a>
+                <a class="show_textbooks" id="show_term_textbooks" href="/textbooks/{{year}},{{quarter}}{{#if summer_term}},{{toLowerCase summer_term}}{{/if}}" title="View textbooks" aria-label="View textbook details for this quarter" ><i role="presentation" class="fa fa-chevron-right"></i></a>
             </div>
         {{/unless}}
     </div>

myuw/test/views/textbooks.py

@@ -0,0 +1,50 @@
+from unittest2 import skipIf
+from django.test.utils import override_settings
+from django.core.urlresolvers import reverse
+from myuw.test.api import missing_url, require_url, MyuwApiTest
+
+
+@require_url('myuw_home')
+class TestTextbook(MyuwApiTest):
+
+    @skipIf(missing_url("myuw_textbooks_page"),
+            "myuw_textbooks_page urls not configured")
+    def test_textbook_current(self):
+        url = reverse("myuw_textbooks_page")
+        self.set_user("javerage")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertIsNone(response.context['term'])
+        self.assertIsNone(response.context['textbook'])
+        self.assertEqual(response.context['year'], 2013)
+        self.assertEqual(response.context['quarter'], 'spring')
+
+        response = self.client.get(url + "/2013,spring/PHYS121AC")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['term'], u'2013,spring')
+        self.assertEqual(response.context['textbook'], u'PHYS121AC')
+
+    @skipIf(missing_url("myuw_textbooks_page"),
+            "myuw_pref_new_site urls not configured")
+    def test_textbook_future(self):
+        url = reverse("myuw_textbooks_page")
+        self.set_user("javerage")
+        response = self.client.get(url + "/2013,autumn")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['term'], u'2013,autumn')
+        self.assertIsNone(response.context['textbook'])
+
+        response = self.client.get(url + "/2013,summer,a-term")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['term'], u'2013,summer,a-term')
+        self.assertIsNone(response.context['textbook'])
+
+        response = self.client.get(url + "/2013,summer,b-term")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['term'], u'2013,summer,b-term')
+        self.assertIsNone(response.context['textbook'])
+
+        response = self.client.get(url + "/2013,summer,b-term/TRAIN101A")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['term'], u'2013,summer,b-term')
+        self.assertEqual(response.context['textbook'], u'TRAIN101A')

myuw/tests.py

@@ -54,6 +54,7 @@
 from myuw.test.views.logout import TestLogoutLink
 from myuw.test.views.mobile_login import TestLoginRedirects
 from myuw.test.views.rest_dispatch import TestDispatchErrorCases
+from myuw.test.views.textbooks import TestTextbook
 from myuw.test.template_tags import TestNetidHash
 from myuw.test.userservice_validation import TestValidation
 from myuw.test.speed import TestPageSpeeds

myuw/urls.py

@@ -137,11 +137,11 @@
         name="myuw_academic_calendar_page"),
     url(r'^future_quarters/(?P<quarter>2[0-9]{3},[-,a-z]+)',
         future_quarters, name="myuw_future_quarters_page"),
-    url(r'^textbooks/?',
+    url(r'^textbooks/(?P<term>2[0-9]{3},[-,a-z]+)/(?P<textbook>[%A-Z0-9]+)',
         textbooks, name="myuw_textbooks_page"),
-    url(r'^textbooks/(?P<term>2[0-9]{3}-[a-z]+)',
+    url(r'^textbooks/(?P<term>2[0-9]{3},[-,a-z]+)',
         textbooks, name="myuw_textbooks_page"),
-    url(r'^textbooks/(?P<term>2[0-9]{3}-[a-z]+)/(?P<textbook>[%A-Z0-9]+)',
+    url(r'^textbooks/?',
         textbooks, name="myuw_textbooks_page"),
     url(r'^resource(/((?P<category>[a-z]+)?(/(?P<topic>[a-z]+))?)?)?',
         category, name="myuw_resource_page"),