From 076416c228c3b8719a7faa9a7fa7187f0896d37f Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 19 Aug 2015 11:23:29 -0700
Subject: [PATCH] fix functional tests

---
 Gemfile                                                    | 1 +
 Gemfile.lock                                               | 3 +++
 .../user/password_reset_mailer/confirmation.html.erb       | 2 +-
 app/views/posts/partials/show/_share.html.erb              | 2 +-
 app/views/sessions/new.html.erb                            | 2 +-
 test/functional/explore/posts_controller_test.rb           | 7 -------
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2983c81dc..39c79f2b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,6 +50,7 @@ gem 'coinbase'
 gem 'stripe'
 gem 'twitter'
 gem 'aws-sdk', '~> 2'
+gem 'responders'
 
 # needed for looser jpeg header compat
 gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c5056c8d..384d7eb03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,6 +215,8 @@ GEM
     raindrops (0.15.0)
     rake (10.4.2)
     ref (2.0.0)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -348,6 +350,7 @@ DEPENDENCIES
   pry
   radix62 (~> 1.0.1)
   rails (~> 4.2.0)
+  responders
   rmagick
   ruby-imagespec!
   ruby-prof
diff --git a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
index d210cf186..93f758add 100644
--- a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
+++ b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
@@ -2,4 +2,4 @@
 
 <p>The password for the user "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> has been reset. It is now <code><%= @new_password %></code>.</p>
 
-<p>Please log in to the website and <%= link_to "change your password", edit_user_path(@user, :host => Danbooru.config.hostname, :only_path => false) %> as soon as possible.</p>
+<p>Please log in to the website and <%= link_to "change your password", edit_user_url(@user, :host => Danbooru.config.hostname, :only_path => false) %> as soon as possible.</p>
diff --git a/app/views/posts/partials/show/_share.html.erb b/app/views/posts/partials/show/_share.html.erb
index 3df6f8861..27e40ff31 100644
--- a/app/views/posts/partials/show/_share.html.erb
+++ b/app/views/posts/partials/show/_share.html.erb
@@ -10,7 +10,7 @@
   <script type="text/javascript">
     var addthis_config = {"data_track_addressbar": false, "pubid": "ra-4f8dbf8a41066ac7"};
     var addthis_share = {
-      "url":"<%= j post_path(post, :only_path => false, :host => Danbooru.config.hostname) %>",
+      "url":"<%= j post_url(post, :only_path => false, :host => Danbooru.config.hostname) %>",
       "title": "<%= '#r_18 ' unless post.rating == 's' %><%= escape_javascript post.presenter.humanized_essential_tag_string.html_safe %>"
     };
   </script>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 6aad78cbe..236a198dd 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -23,7 +23,7 @@
         </div>
       <% end %>
 
-      <p><%= link_to "Sign in securely", new_session_path(:protocol => "https", :only_path => false) %></p>
+      <p><%= link_to "Sign in securely", new_session_url(:protocol => "https", :only_path => false) %></p>
     </section>
   </div>
 </div>
diff --git a/test/functional/explore/posts_controller_test.rb b/test/functional/explore/posts_controller_test.rb
index 23b5c3ce3..5288923d4 100644
--- a/test/functional/explore/posts_controller_test.rb
+++ b/test/functional/explore/posts_controller_test.rb
@@ -15,13 +15,6 @@ module Explore
           assert_response :success
         end
       end
-
-      context "#intro" do
-        should "render" do
-          get :intro
-          assert_response :success
-        end
-      end
     end
   end
 end