devise 2.2.1 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/CHANGELOG.rdoc +5 -0
  2. data/app/views/devise/registrations/edit.html.erb +2 -2
  3. data/lib/devise/version.rb +1 -1
  4. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +1 -1
  5. data/test/integration/registerable_test.rb +2 -2
  6. metadata +2 -2
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,8 @@
1
+ == 2.2.2
2
+
3
+ * bug fix
4
+ * Fix bug when checking for reconfirmable in templates
5
+
1
6
  == 2.2.1
2
7
 
3
8
  * bug fix
data/app/views/devise/registrations/edit.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
  <div><%= f.label :email %><br />
7
7
  <%= f.email_field :email, :autofocus => true %></div>
8
8
 
9
- <% if resource.class.reconfirmable && resource.unconfirmed_email.present? %>
9
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
10
10
  <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
11
11
  <% end %>
12
12
 
@@ -24,6 +24,6 @@
24
24
 
25
25
  <h3>Cancel my account</h3>
26
26
 
27
- <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
27
+ <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
28
28
 
29
29
  <%= link_to "Back", :back %>
data/lib/devise/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Devise
2
- VERSION = "2.2.1".freeze
2
+ VERSION = "2.2.2".freeze
3
3
  end
data/lib/generators/templates/simple_form_for/registrations/edit.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
  <div class="form-inputs">
7
7
  <%= f.input :email, :required => true, :autofocus => true %>
8
8
 
9
- <% if resource.class.reconfirmable && resource.unconfirmed_email.present? %>
9
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
10
10
  <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
11
11
  <% end %>
12
12
 
data/test/integration/registerable_test.rb CHANGED
@@ -214,7 +214,7 @@ class RegistrationTest < ActionController::IntegrationTest
214
214
  sign_in_as_user
215
215
  get edit_user_registration_path
216
216
 
217
- click_link "Cancel my account", :method => :delete
217
+ click_button "Cancel my account"
218
218
  assert_contain "Bye! Your account was successfully cancelled. We hope to see you again soon."
219
219
 
220
220
  assert User.all.empty?
@@ -344,4 +344,4 @@ class ReconfirmableRegistrationTest < ActionController::IntegrationTest
344
344
  assert_equal "admin.new@example.com", Admin.first.unconfirmed_email
345
345
  assert Admin.first.valid_password?('pas123')
346
346
  end
347
- end
347
+ end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: devise
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.2.1
5
+ version: 2.2.2
6
6
  platform: ruby
7
7
  authors:
8
8
  - José Valim
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-11 00:00:00.000000000 Z
13
+ date: 2013-01-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  version_requirements: !ruby/object:Gem::Requirement