fix functional tests

This commit is contained in:
r888888888 2015-08-19 11:23:29 -07:00
parent b1bbb4fd9b
commit 076416c228
6 changed files with 7 additions and 10 deletions

View File

@ -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"

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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