Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2251 from mbeijen/404

Browse source 
Fixed typo in 404: Ressource -> resource
This commit is contained in:
Thorsten 2018-09-24 08:22:46 +02:00 committed by GitHub
commit e6f434328d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/404.html
View file

@ -4,13 +4,13 @@
<title>404: Not Found</title> <title>404: Not Found</title>
<link rel="stylesheet" href="/assets/error/style.css"> <link rel="stylesheet" href="/assets/error/style.css">
<body <% if @traceback %>class="error-message"<% end %>> <body <% if @traceback %>class="error-message"<% end %>>
<h1>404: Requested Ressource was not found.</h1> <h1>404: Requested resource was not found</h1>
<% if @message.present? %> <% if @message.present? %>
<div><%= @message %></div> <div><%= @message %></div>
<% end %> <% end %>
<% if !@traceback %> <% if !@traceback %>
<div class="error-image" style="background-image: url(/assets/error/error-2.svg)"></div> <div class="error-image" style="background-image: url(/assets/error/error-2.svg)"></div>
<p>Sorry, but the Phoenix is not able to find your ressource. Try checking the URL for errors.</p> <p>Sorry, but the Phoenix is not able to find your resource. Try checking the URL for errors.</p>
<% else %> <% else %>
<div><%= @exception.message %></div> <div><%= @exception.message %></div>
<% if @exception.backtrace %> <% if @exception.backtrace %>
@ -21,4 +21,4 @@
<% end %> <% end %>
<% end %> <% end %>
</body> </body>
</html> </html>

4
spec/requests/basic_spec.rb
View file

@ -56,7 +56,7 @@ RSpec.describe 'Basics', type: :request do
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
expect(response.body).to match(/<html/) expect(response.body).to match(/<html/)
expect(response.body).to match(%r{<title>404: Not Found</title>}) expect(response.body).to match(%r{<title>404: Not Found</title>})
expect(response.body).to match(%r{<h1>404: Requested Ressource was not found.</h1>}) expect(response.body).to match(%r{<h1>404: Requested resource was not found</h1>})
expect(response.body).to match(%r{No route matches \[GET\] /not_existing_url}) expect(response.body).to match(%r{No route matches \[GET\] /not_existing_url})
# 401 # 401
@ -88,7 +88,7 @@ RSpec.describe 'Basics', type: :request do
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
expect(response.body).to match(/<html/) expect(response.body).to match(/<html/)
expect(response.body).to match(%r{<title>404: Not Found</title>}) expect(response.body).to match(%r{<title>404: Not Found</title>})
expect(response.body).to match(%r{<h1>404: Requested Ressource was not found.</h1>}) expect(response.body).to match(%r{<h1>404: Requested resource was not found</h1>})
expect(response.body).to match(/some error message/) expect(response.body).to match(/some error message/)
# 500 # 500