7 files changed, 14 insertions, 49 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 6b77fd44f1..c15fb4304d 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,8 +1,8 @@
-*  Added log "Rendering ...", when starting to render a template to log that
-   we have started rendering something. This helps to easily identify the origin
-   of queries in the log whether they came from controller or views.
+*   Added log "Rendering ...", when starting to render a template to log that
+    we have started rendering something. This helps to easily identify the origin
+    of queries in the log whether they came from controller or views.
 
-   *Vipul A M and Prem Sichanugrist*
+    *Vipul A M and Prem Sichanugrist*
 
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index c1015ffe89..e91b3443c5 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -1922,8 +1922,6 @@ module ActionView
             @object_name.to_s.humanize
           end
 
-          model = model.downcase
-
           defaults = []
           defaults << :"helpers.submit.#{object_name}.#{key}"
           defaults << :"helpers.submit.#{key}"
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb
index 514804b08e..13b4ec6133 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -521,7 +521,7 @@ module ActionView
     def retrieve_variable(path, as)
       variable = as || begin
         base = path[-1] == "/".freeze ? "".freeze : File.basename(path)
-        raise_invalid_identifier(path) unless base =~ /\A_?(.*)(?:\.\w+)*\z/
+        raise_invalid_identifier(path) unless base =~ /\A_?(.*?)(?:\.\w+)*\z/
         $1.to_sym
       end
       if @collection
diff --git a/actionview/test/fixtures/test/_customer.mobile.erb b/actionview/test/fixtures/test/_customer.mobile.erb
new file mode 100644
index 0000000000..d8220afeda
--- /dev/null
+++ b/actionview/test/fixtures/test/_customer.mobile.erb
@@ -0,0 +1 @@
+Hello: <%= customer.name rescue "Anonymous" %>
+\ No newline at end of file
diff --git a/actionview/test/lib/controller/fake_models.rb b/actionview/test/lib/controller/fake_models.rb
index a122fe17c9..65c68fc34a 100644
--- a/actionview/test/lib/controller/fake_models.rb
+++ b/actionview/test/lib/controller/fake_models.rb
@@ -31,27 +31,6 @@ end
 class GoodCustomer < Customer
 end
 
-class TicketType < Struct.new(:name)
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-  extend ActiveModel::Translation
-
-  def initialize(*args)
-    super
-    @persisted = false
-  end
-
-  def persisted=(boolean)
-    @persisted = boolean
-  end
-
-  def persisted?
-    @persisted
-  end
-
-  attr_accessor :name
-end
-
 class Post < Struct.new(:title, :author_name, :body, :secret, :persisted, :written_on, :cost)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 034b8a4bf6..e77183e39f 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -128,8 +128,6 @@ class FormHelperTest < ActionView::TestCase
     @post_delegator.title = 'Hello World'
 
     @car = Car.new("#000FFF")
-
-    @ticket_type = TicketType.new
   end
 
   Routes = ActionDispatch::Routing::RouteSet.new
@@ -138,8 +136,6 @@ class FormHelperTest < ActionView::TestCase
       resources :comments
     end
 
-    resources :ticket_types
-
     namespace :admin do
       resources :posts do
         resources :comments
@@ -1876,20 +1872,6 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_lowercase_model_name_default_submit_button_value
-    form_for(@ticket_type) do |f|
-      concat f.submit
-    end
-
-    expected =
-      '<form class="new_ticket_type" id="new_ticket_type" action="/ticket_types" accept-charset="UTF-8" method="post">' +
-        hidden_fields +
-        '<input type="submit" name="commit" value="Create ticket type" data-disable-with="Create ticket type" />' +
-      '</form>'
-
-    assert_dom_equal expected, output_buffer
-  end
-
   def test_form_for_with_symbol_object_name
     form_for(@post, as: "other_name", html: { id: "create-post" }) do |f|
       concat f.label(:title, class: 'post_title')
@@ -2257,7 +2239,7 @@ class FormHelperTest < ActionView::TestCase
         end
 
         expected = whole_form('/posts', 'new_post', 'new_post') do
-          "<input name='commit' data-disable-with='Create post' type='submit' value='Create post' />"
+          "<input name='commit' data-disable-with='Create Post' type='submit' value='Create Post' />"
         end
 
         assert_dom_equal expected, output_buffer
@@ -2272,7 +2254,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Confirm post changes' type='submit' value='Confirm post changes' />"
+      "<input name='commit' data-disable-with='Confirm Post changes' type='submit' value='Confirm Post changes' />"
       end
 
       assert_dom_equal expected, output_buffer
@@ -2300,7 +2282,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Update your post' type='submit' value='Update your post' />"
+      "<input name='commit' data-disable-with='Update your Post' type='submit' value='Update your Post' />"
       end
 
       assert_dom_equal expected, output_buffer
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 3561114d90..b417d1ebfa 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -270,6 +270,11 @@ module RenderTestCases
     assert_equal "Hello: davidHello: mary", @view.render(:partial => "test/customer", :collection => [ Customer.new("david"), Customer.new("mary") ])
   end
 
+  def test_render_partial_collection_with_partial_name_containing_dot
+    assert_equal "Hello: davidHello: mary",
+      @view.render(:partial => "test/customer.mobile", :collection => [ Customer.new("david"), Customer.new("mary") ])
+  end
+
   def test_render_partial_collection_as_by_string
     assert_equal "david david davidmary mary mary",
       @view.render(:partial => "test/customer_with_var", :collection => [ Customer.new("david"), Customer.new("mary") ], :as => 'customer')