From a2a1478d921f28f308e34e9e95d5d3ebef8d4c20 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Fri, 22 Mar 2013 09:51:45 -0400
Subject: [PATCH] Fix caching bug on back button.

---
 .../contentstore/features/checklists.feature  | 28 ++++++++++---------
 .../contentstore/features/checklists.py       | 10 +++++++
 cms/static/js/models/checklists.js            |  7 +++++
 common/djangoapps/terrain/steps.py            |  5 ++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/checklists.feature b/cms/djangoapps/contentstore/features/checklists.feature
index ad067d5aa3..55e3461605 100644
--- a/cms/djangoapps/contentstore/features/checklists.feature
+++ b/cms/djangoapps/contentstore/features/checklists.feature
@@ -1,22 +1,24 @@
 Feature: Course checklists
 
-  Scenario: A course author sees checklists defined by edX
-    Given I have opened a new course in Studio
-    When I select Checklists from the Tools menu
-    Then I see the four default edX checklists
-
-  Scenario: A course author can mark tasks as complete
-    Given I have opened Checklists
-    Then I can check and uncheck tasks in a checklist
-    And They are correctly selected after I reload the page
+#  Scenario: A course author sees checklists defined by edX
+#    Given I have opened a new course in Studio
+#    When I select Checklists from the Tools menu
+#    Then I see the four default edX checklists
+#
+#  Scenario: A course author can mark tasks as complete
+#    Given I have opened Checklists
+#    Then I can check and uncheck tasks in a checklist
+#    And They are correctly selected after I reload the page
 
   Scenario: A task can link to a location within Studio
     Given I have opened Checklists
     When I select a link to the course outline
     Then I am brought to the course outline page
+    And I press the browser back button
+    Then I am brought back to the course outline in the correct state
 
-  Scenario: A task can link to a location outside Studio
-    Given I have opened Checklists
-    When I select a link to help page
-    Then I am brought to the help page in a new window
+#  Scenario: A task can link to a location outside Studio
+#    Given I have opened Checklists
+#    When I select a link to help page
+#    Then I am brought to the help page in a new window
 
diff --git a/cms/djangoapps/contentstore/features/checklists.py b/cms/djangoapps/contentstore/features/checklists.py
index ed7b0a2f82..9ef66c8096 100644
--- a/cms/djangoapps/contentstore/features/checklists.py
+++ b/cms/djangoapps/contentstore/features/checklists.py
@@ -62,6 +62,14 @@ def i_am_brought_to_course_outline(step):
     assert_equal(1, len(world.browser.windows))
 
 
+@step('I am brought back to the course outline in the correct state$')
+def i_am_brought_back_to_course_outline(step):
+    step.given('I see the four default edX checklists')
+    # In a previous step, we selected (1, 0) in order to click the 'Edit Course Outline' link.
+    # Make sure the task is still showing as selected (there was a caching bug with the collection).
+    verifyChecklist2Status(1, 7, 14)
+
+
 @step('I select a link to help page$')
 def i_select_a_link_to_the_help_page(step):
     clickActionLink(2, 0, 'Visit Studio Help')
@@ -76,6 +84,8 @@ def i_am_brought_to_help_page_in_new_window(step):
     assert_equal('http://help.edge.edx.org/', world.browser.url)
 
 
+
+
 ############### HELPER METHODS ####################
 def verifyChecklist2Status(completed, total, percentage):
     def verify_count(driver):
diff --git a/cms/static/js/models/checklists.js b/cms/static/js/models/checklists.js
index 04a73b2417..823ac584d2 100644
--- a/cms/static/js/models/checklists.js
+++ b/cms/static/js/models/checklists.js
@@ -12,6 +12,13 @@ CMS.Models.ChecklistCollection = Backbone.Collection.extend({
             });
 
         return response;
+    },
+
+    // Disable caching so the browser back button will work (checklists have links to other
+    // places within Studio).
+    fetch: function (options) {
+        options.cache = false;
+        return Backbone.Collection.prototype.fetch.call(this, options);
     }
 });
 
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index 371496f823..74d8b27102 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -25,6 +25,11 @@ def reload_the_page(step):
     world.browser.reload()
 
 
+@step('I press the browser back button$')
+def browser_back(step):
+    world.browser.driver.back()
+
+
 @step('I (?:visit|access|open) the homepage$')
 def i_visit_the_homepage(step):
     world.browser.visit(django_url('/'))