Merge branch 'release/0.40.0'

README.md

@@ -1,4 +1,4 @@
-# The Internet 0.39.0 (12-11-2014)
+# The Internet 0.40.0 (12-12-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.
@@ -17,6 +17,7 @@ Deployed and available at [http://the-internet.herokuapp.com](http://the-interne
 + [Drag and Drop](http://the-internet.herokuapp.com/drag_and_drop)
 + [Dropdown](http://the-internet.herokuapp.com/dropdown)
 + [Dynamic Content](http://the-internet.herokuapp.com/dynamic_content)
++ [Dynamic Controls](http://the-internet.herokuapp.com/dynamic_controls)
 + [Dynamic Loading](http://the-internet.herokuapp.com/dynamic_loading)
 + [File Download](http://the-internet.herokuapp.com/download)
 + [File Upload](http://the-internet.herokuapp.com/upload)

README.template

@@ -1,4 +1,4 @@
-# The Internet 0.39.0 (12-11-2014)
+# The Internet 0.40.0 (12-12-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.

VERSION

@@ -1 +1 @@
-0.39.0
+0.40.0

changelog.md

@@ -1,3 +1,6 @@
+#0.40.0
++ Made is so the number of pixels can be specified in the URL for /shifting_content and /shifting_content/random
+
 #0.39.0
 + Pulled in the pull request for a dynamic controls example
 

examples.csv

@@ -31,3 +31,4 @@ Shifting Content,/shifting_content
 Dynamic Content,/dynamic_content
 Challenging DOM,/challenging_dom
 Disappearing Elements,/disappearing_elements
+Dynamic Controls,/dynamic_controls

server.rb

@@ -376,12 +376,34 @@ def authorized?
   erb :shifting_content
 end
 
+get '/shifting_content/:pixel_shift' do |pixel_shift|
+  pixel_count = [0, pixel_shift]
+  cookies[:page_visit_count] ||= '0'
+  page_visit_count = cookies[:page_visit_count].to_i
+
+  if page_visit_count.even?
+    @pixel_shift = pixel_count[0]
+  else
+    @pixel_shift = pixel_count[1]
+  end
+
+  page_visit_count += 1
+  cookies[:page_visit_count] = page_visit_count.to_s
+  erb :shifting_content
+end
+
 get '/shifting_content/random' do
   pixel_count = [0, 25]
   @pixel_shift = pixel_count[rand(2)]
   erb :shifting_content
 end
 
+get '/shifting_content/random/:pixel_shift' do |pixel_shift|
+  pixel_count = [0, pixel_shift]
+  @pixel_shift = pixel_count[rand(2)]
+  erb :shifting_content
+end
+
 get '/challenging_dom' do
   require 'uuid'
   @text = %w(foo bar baz qux)