Merge pull request #676 from citizensadvice/chore/cookie-prefs-v0.3.0

Chore/cookie prefs v0.3.0

Author: marianayovcheva

.github/workflows/lint_and_test.yml

@@ -87,6 +87,7 @@ jobs:
       CONTENTFUL_CDA_TOKEN: ${{ secrets.CONTENTFUL_CDA_TOKEN }}
       CONTENTFUL_SPACE_ID: ${{ secrets.CONTENTFUL_SPACE_ID }}
       CONTENTFUL_ENVIRONMENT_ID: ${{ secrets.CONTENTFUL_ENVIRONMENT_ID }}
+      LOCAL_RETURN_HOST: "127.0.0.1"
     needs: lint
     steps:
       - name: "Checkout"

Gemfile

@@ -43,7 +43,7 @@ gem "citizens_advice_components",
 
 gem "citizens_advice_cookie_preferences",
     github: "citizensadvice/cookie-preferences",
-    tag: "v0.1.0"
+    tag: "v0.3.0"
 
 # The citizens_advice_components gem uses view component but we also use this to write
 # our app components so explicitly name it as an application dependency.

Gemfile.lock

@@ -21,10 +21,10 @@ GIT
 
 GIT
   remote: https://github.com/citizensadvice/cookie-preferences.git
-  revision: 387fcecdc9bf3e5508442b5e14abf7e1f8be921b
-  tag: v0.1.0
+  revision: ad7ed58fc4693bf88bb848826f7c5554317d004f
+  tag: v0.3.0
   specs:
-    citizens_advice_cookie_preferences (0.1.0)
+    citizens_advice_cookie_preferences (0.3.0)
       citizens_advice_components (> 8.0.0)
       meta-tags
       rails (>= 7.1.0)

features/step_definitions/cookie_preferences_steps.rb

@@ -4,5 +4,5 @@
   expect(page).to have_text("We'd also like to use additional cookies")
   expect(page).to have_no_text("It looks like you have JavaScript turned off.")
   expect(page).to have_link("find out more about the cookies we use", href: "/about-us/information/how-we-use-cookies/")
-  expect(page).to have_link("Choose cookies", href: "/cookie-preferences")
+  expect(page).to have_link("Choose cookies", href: "/cookie-preferences/?ReturnUrl=#{CGI.escape(current_url)}")
 end