Merge remote-tracking branch 'upstream/pull/2061'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7232d199b03b52a27137d55691389f75b6413f87..c3c8cc7b4b6cf7188814366be0c692f3844e679f 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -141,7 +141,7 @@ Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changesets_controller.rb
similarity index 99%
rename from app/controllers/changeset_controller.rb
rename to app/controllers/changesets_controller.rb
index 7c9944f631effda92b800144e1ff74a9bb8039a8..e4fd593d7d35d34015640d002ec8a59ae922e20c 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -1,6 +1,6 @@
 # The ChangesetController is the RESTful interface to Changeset objects
 
-class ChangesetController < ApplicationController
+class ChangesetsController < ApplicationController
   layout "site"
   require "xml/libxml"
 

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changesets_helper.rb
similarity index 84%
rename from app/helpers/changeset_helper.rb
rename to app/helpers/changesets_helper.rb
index 9bcae4ad4d010ce0fe3de73bcb5b666b83e5db31..4a327c16c158139d1cb7e62d956449263b6a112f 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -1,4 +1,4 @@
-module ChangesetHelper
+module ChangesetsHelper
   def changeset_user_link(changeset)
     if changeset.user.status == "deleted"
       t("users.no_such_user.deleted")
@@ -34,13 +34,13 @@ module ChangesetHelper
 
   def changeset_index_title(params, user)
     if params[:friends] && user
-      t "changeset.index.title_friend"
+      t "changesets.index.title_friend"
     elsif params[:nearby] && user
-      t "changeset.index.title_nearby"
+      t "changesets.index.title_nearby"
     elsif params[:display_name]
-      t "changeset.index.title_user", :user => params[:display_name]
+      t "changesets.index.title_user", :user => params[:display_name]
     else
-      t "changeset.index.title"
+      t "changesets.index.title"
     end
   end
 end

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 81e930812c883310f7d8525d6dbdf83855743905..c63b0112e0819d07e4cfbc53d937dc0400241217 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -127,7 +127,7 @@
     <% end %>
     <%=
         user = (@prev_by_user || @next_by_user).user.display_name
-        link_to content_tag(:bdi, user), :controller => "changeset", :action => "index", :display_name => user
+        link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user
     %>
     <% if @next_by_user %>
       &middot;
@@ -137,7 +137,7 @@
 <% end %>
 
 <div class='secondary-actions'>
-  <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %>
+  <%= link_to(t('.changesetxml'), :controller => "changesets", :action => "read") %>
   &middot;
-  <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>
+  <%= link_to(t('.osmchangexml'), :controller => "changesets", :action => "download") %>
 </div>

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
similarity index 100%
rename from app/views/changeset/_changeset.html.erb
rename to app/views/changesets/_changeset.html.erb

diff --git a/app/views/changeset/_user.atom.builder b/app/views/changesets/_user.atom.builder
similarity index 100%
rename from app/views/changeset/_user.atom.builder
rename to app/views/changesets/_user.atom.builder

diff --git a/app/views/changeset/history.html.erb b/app/views/changesets/history.html.erb
similarity index 78%
rename from app/views/changeset/history.html.erb
rename to app/views/changesets/history.html.erb
index ba745cb032489d833ddcf36b997fb6b3c0a49b0f..1117f01b3b46229282c09d4545d6ad70896d0355 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -7,7 +7,7 @@
 <%
    set_title(changeset_index_title(params, current_user))
    if params[:display_name]
-     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
+     @heading = t('changesets.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
    else
      @heading = @title
    end

diff --git a/app/views/changeset/index.atom.builder b/app/views/changesets/index.atom.builder
similarity index 100%
rename from app/views/changeset/index.atom.builder
rename to app/views/changesets/index.atom.builder

diff --git a/app/views/changeset/index.html.erb b/app/views/changesets/index.html.erb
similarity index 100%
rename from app/views/changeset/index.html.erb
rename to app/views/changesets/index.html.erb

diff --git a/app/views/changeset/timeout.atom.builder b/app/views/changesets/timeout.atom.builder
similarity index 100%
rename from app/views/changeset/timeout.atom.builder
rename to app/views/changesets/timeout.atom.builder

diff --git a/app/views/changeset/timeout.html.erb b/app/views/changesets/timeout.html.erb
similarity index 100%
rename from app/views/changeset/timeout.html.erb
rename to app/views/changesets/timeout.html.erb

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index 862eae17c2ae257cc8c1a251f2ae27fc132ee32b..694f9960258634b1858915d5f207dcc259e2e807 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,17 +1,17 @@
 <p>
 
 <% if @page > 1 %>
-<%= link_to t('changeset.changeset_paging_nav.previous'), @params.merge({ :page => @page - 1 }) %>
+<%= link_to t('changesets.changeset_paging_nav.previous'), @params.merge({ :page => @page - 1 }) %>
 <% else %>
-<%= t('changeset.changeset_paging_nav.previous') %>
+<%= t('changesets.changeset_paging_nav.previous') %>
 <% end %>
 
-| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+| <%= t('changesets.changeset_paging_nav.showing_page', :page => @page) %> |
 
 <% if @notes.size < @page_size %>
-<%= t('changeset.changeset_paging_nav.next') %>
+<%= t('changesets.changeset_paging_nav.next') %>
 <% else %>
-<%= link_to t('changeset.changeset_paging_nav.next'), @params.merge({ :page => @page + 1 }) %>
+<%= link_to t('changesets.changeset_paging_nav.next'), @params.merge({ :page => @page + 1 }) %>
 <% end %>
 
 </p>

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index ab56ce3e80a310f144611a47307d61e5bb6eb999..5c3afaa89c89831fc3e85c5c1a8d3d1e6c4361d9 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -27,10 +27,10 @@
         <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
         "<%= link_to(comment,
                             {:controller => 'browse', :action => 'changeset', :id => changeset.id},
-                            {:title => t('changeset.changeset.view_changeset_details')})
+                            {:title => t('changesets.changeset.view_changeset_details')})
         %>"
       <% else %>
-       <%= t'changeset.changeset.no_edits' %>
+       <%= t'changesets.changeset.no_edits' %>
       <% end %>
     </p>
 

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c7a41b687b71c300068a07fc58a308c70cda7374..f62550928ff73b457f2de4ca3f93e14a8739baef 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -7,7 +7,7 @@
         <!-- Displaying user's own profile page to themself -->
         <ul class='secondary-actions clearfix'>
           <li>
-            <%= link_to t('.my edits'), :controller => 'changeset', :action => 'index', :display_name => current_user.display_name %>
+            <%= link_to t('.my edits'), :controller => 'changesets', :action => 'index', :display_name => current_user.display_name %>
             <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
           </li>
           <li>
@@ -49,7 +49,7 @@
         <ul class='secondary-actions clearfix'>
 
           <li>
-            <%= link_to t('.edits'), :controller => 'changeset', :action => 'index', :display_name => @user.display_name %>
+            <%= link_to t('.edits'), :controller => 'changesets', :action => 'index', :display_name => @user.display_name %>
             <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
           </li>
           <li>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 197c6308ccb3385c0250396a5ad791bd8c2cce00..8a0c62b03695f18fb421f9ef0d50f62cdedf880c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -213,7 +213,7 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
       next: "Next »"

diff --git a/config/routes.rb b/config/routes.rb
index 78146606429787f6ec7fd78c74a628ce7b9f0341..b245e8fec0c155b587e5d52c499eedcb607718d3 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,16 +6,16 @@ OpenStreetMap::Application.routes.draw do
     get "capabilities" => "api#capabilities"
     get "permissions" => "api#permissions"
 
-    put "changeset/create" => "changeset#create"
-    post "changeset/:id/upload" => "changeset#upload", :id => /\d+/
-    get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/
-    post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/
-    get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/
-    post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/
-    post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
-    put "changeset/:id" => "changeset#update", :id => /\d+/
-    put "changeset/:id/close" => "changeset#close", :id => /\d+/
-    get "changesets" => "changeset#query"
+    put "changeset/create" => "changesets#create"
+    post "changeset/:id/upload" => "changesets#upload", :id => /\d+/
+    get "changeset/:id/download" => "changesets#download", :as => :changeset_download, :id => /\d+/
+    post "changeset/:id/expand_bbox" => "changesets#expand_bbox", :id => /\d+/
+    get "changeset/:id" => "changesets#read", :as => :changeset_read, :id => /\d+/
+    post "changeset/:id/subscribe" => "changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/
+    post "changeset/:id/unsubscribe" => "changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
+    put "changeset/:id" => "changesets#update", :id => /\d+/
+    put "changeset/:id/close" => "changesets#close", :id => /\d+/
+    get "changesets" => "changesets#query"
     post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/
     post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
     post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/
@@ -119,11 +119,11 @@ OpenStreetMap::Application.routes.draw do
   get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
   get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note"
   get "/note/new" => "browse#new_note"
-  get "/user/:display_name/history" => "changeset#index"
-  get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom }
+  get "/user/:display_name/history" => "changesets#index"
+  get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
   get "/user/:display_name/notes" => "notes#mine"
-  get "/history/friends" => "changeset#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
-  get "/history/nearby" => "changeset#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
+  get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
+  get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
 
   get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
   get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")
@@ -150,8 +150,8 @@ OpenStreetMap::Application.routes.draw do
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"
   get "/about" => "site#about"
-  get "/history" => "changeset#index"
-  get "/history/feed" => "changeset#feed", :defaults => { :format => :atom }
+  get "/history" => "changesets#index"
+  get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }
   get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
   get "/export" => "site#export"
   match "/login" => "users#login", :via => [:get, :post]

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changesets_controller_test.rb
similarity index 98%
rename from test/controllers/changeset_controller_test.rb
rename to test/controllers/changesets_controller_test.rb
index 7dc479cad825a96965d1a17ff5b50fc726b03a7e..867b599eb2c6363515e4234029cd740cef75cfd1 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -1,73 +1,72 @@
 require "test_helper"
-require "changeset_controller"
 
-class ChangesetControllerTest < ActionController::TestCase
+class ChangesetsControllerTest < ActionController::TestCase
   ##
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
       { :path => "/api/0.6/changeset/create", :method => :put },
-      { :controller => "changeset", :action => "create" }
+      { :controller => "changesets", :action => "create" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/upload", :method => :post },
-      { :controller => "changeset", :action => "upload", :id => "1" }
+      { :controller => "changesets", :action => "upload", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/download", :method => :get },
-      { :controller => "changeset", :action => "download", :id => "1" }
+      { :controller => "changesets", :action => "download", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/expand_bbox", :method => :post },
-      { :controller => "changeset", :action => "expand_bbox", :id => "1" }
+      { :controller => "changesets", :action => "expand_bbox", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1", :method => :get },
-      { :controller => "changeset", :action => "read", :id => "1" }
+      { :controller => "changesets", :action => "read", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
-      { :controller => "changeset", :action => "subscribe", :id => "1" }
+      { :controller => "changesets", :action => "subscribe", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
-      { :controller => "changeset", :action => "unsubscribe", :id => "1" }
+      { :controller => "changesets", :action => "unsubscribe", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1", :method => :put },
-      { :controller => "changeset", :action => "update", :id => "1" }
+      { :controller => "changesets", :action => "update", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1/close", :method => :put },
-      { :controller => "changeset", :action => "close", :id => "1" }
+      { :controller => "changesets", :action => "close", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changesets", :method => :get },
-      { :controller => "changeset", :action => "query" }
+      { :controller => "changesets", :action => "query" }
     )
     assert_routing(
       { :path => "/user/name/history", :method => :get },
-      { :controller => "changeset", :action => "index", :display_name => "name" }
+      { :controller => "changesets", :action => "index", :display_name => "name" }
     )
     assert_routing(
       { :path => "/user/name/history/feed", :method => :get },
-      { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom }
+      { :controller => "changesets", :action => "feed", :display_name => "name", :format => :atom }
     )
     assert_routing(
       { :path => "/history/friends", :method => :get },
-      { :controller => "changeset", :action => "index", :friends => true, :format => :html }
+      { :controller => "changesets", :action => "index", :friends => true, :format => :html }
     )
     assert_routing(
       { :path => "/history/nearby", :method => :get },
-      { :controller => "changeset", :action => "index", :nearby => true, :format => :html }
+      { :controller => "changesets", :action => "index", :nearby => true, :format => :html }
     )
     assert_routing(
       { :path => "/history", :method => :get },
-      { :controller => "changeset", :action => "index" }
+      { :controller => "changesets", :action => "index" }
     )
     assert_routing(
       { :path => "/history/feed", :method => :get },
-      { :controller => "changeset", :action => "feed", :format => :atom }
+      { :controller => "changesets", :action => "feed", :format => :atom }
     )
   end
 

diff --git a/test/controllers/relations_controller_test.rb b/test/controllers/relations_controller_test.rb
index 1613fbf7a8cb924b8241d0c3ee67f065a38af94b..224caa64294579b9f78aeb2fa3ab9b00460980bb 100644 (file)
--- a/test/controllers/relations_controller_test.rb
+++ b/test/controllers/relations_controller_test.rb
@@ -939,7 +939,7 @@ OSM
 
     # create a new changeset for this operation, so we are assured
     # that the bounding box will be newly-generated.
-    changeset_id = with_controller(ChangesetController.new) do
+    changeset_id = with_controller(ChangesetsController.new) do
       content "<osm><changeset/></osm>"
       put :create
       assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden"
@@ -950,7 +950,7 @@ OSM
 
     # create a new changeset for this operation, so we are assured
     # that the bounding box will be newly-generated.
-    changeset_id = with_controller(ChangesetController.new) do
+    changeset_id = with_controller(ChangesetsController.new) do
       content "<osm><changeset/></osm>"
       put :create
       assert_response :success, "couldn't create changeset for modify test"
@@ -961,7 +961,7 @@ OSM
     yield changeset_id
 
     # now download the changeset to check its bounding box
-    with_controller(ChangesetController.new) do
+    with_controller(ChangesetsController.new) do
       get :read, :params => { :id => changeset_id }
       assert_response :success, "can't re-read changeset for modify test"
       assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}"
@@ -1019,7 +1019,7 @@ OSM
     cs_id = rel.find("//osm/relation").first["changeset"].to_i
     version = nil
 
-    with_controller(ChangesetController.new) do
+    with_controller(ChangesetsController.new) do
       doc = OSM::API.new.get_xml_doc
       change = XML::Node.new "osmChange"
       doc.root = change

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 050fa0e9f169597b5a73581b17b35cc957d12f1e..16b1040e522e99eebe659033f3ed10db6e093f1c 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -43,7 +43,7 @@ class ApplicationHelperTest < ActionView::TestCase
   end
 
   def test_atom_link_to
-    link = atom_link_to(:controller => :changeset, :action => :feed)
+    link = atom_link_to(:controller => :changesets, :action => :feed)
     assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 

diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changesets_helper_test.rb
similarity index 96%
rename from test/helpers/changeset_helper_test.rb
rename to test/helpers/changesets_helper_test.rb
index d932138f8ad2900dc899cb2cf6fbce00acf54958..a25eed6fae2fac1dcad79a769ef655564a0b72ba 100644 (file)
--- a/test/helpers/changeset_helper_test.rb
+++ b/test/helpers/changesets_helper_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ChangesetHelperTest < ActionView::TestCase
+class ChangesetsHelperTest < ActionView::TestCase
   def test_changeset_user_link
     changeset = create(:changeset)
     assert_equal %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>), changeset_user_link(changeset)

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index feaa920659ddbc8147507827c4e8dca810796dbf..89c3a8ac4184706cf71730520faa2d5d6d073425 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -25,7 +25,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -36,7 +36,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", uppercase_user.display_name
   end
 
@@ -57,7 +57,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -66,7 +66,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.upcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -75,7 +75,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email.titlecase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -182,7 +182,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -193,7 +193,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login uppercase_user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", uppercase_user.display_name
   end
 
@@ -214,7 +214,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -223,7 +223,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.upcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -232,7 +232,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name.downcase, "test"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -334,7 +334,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.email, "test", "yes"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
@@ -344,7 +344,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
     try_password_login user.display_name, "test", "yes"
 
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
@@ -369,7 +369,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -393,7 +393,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
     assert session.key?(:_remember_for)
   end
@@ -496,7 +496,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -589,7 +589,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
 
     u = User.find_by(:display_name => user.display_name)
@@ -614,7 +614,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -703,7 +703,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -792,7 +792,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end
 
@@ -881,7 +881,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "changeset/history"
+    assert_template "changesets/history"
     assert_select "span.username", user.display_name
   end