Merge pull request #207 from mezuro/user_edit

Fixes the user edition form

Merge pull request #207 from mezuro/user_edit
Fixes the user edition form
Pedro
2 parents 8842352b f4ddf175
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
app/views/devise/registrations/edit.html.erb
features/users/user_update.feature
@@ -9,7 +9,7 @@
       <div class="form-row">
         <div class="field-container">
           <%= f.label :name, class: 'control-label' %><br />
-          <%= f.email_field :name, :autofocus => true, class: 'text-field form-control' %>
+          <%= f.text_field :name, :autofocus => true, class: 'text-field form-control' %>
         </div>
         <div class="help-container">
           <p>
@@ -3,6 +3,7 @@ Feature: User update
   As a regular user
   I want to have an edit page
  
+  @javascript
   Scenario: with current password
     Given I am a regular user
     And I am signed in
...	...	@@ -9,7 +9,7 @@
9	9	<div class="form-row">
10	10	<div class="field-container">
11	11	<%= f.label :name, class: 'control-label' %><br />
12		- <%= f.email_field :name, :autofocus => true, class: 'text-field form-control' %>
	12	+ <%= f.text_field :name, :autofocus => true, class: 'text-field form-control' %>
13	13	</div>
14	14	<div class="help-container">
15	15	<p>
...	...
...	...	@@ -3,6 +3,7 @@ Feature: User update
3	3	As a regular user
4	4	I want to have an edit page
5	5
	6	+ @javascript
6	7	Scenario: with current password
7	8	Given I am a regular user
8	9	And I am signed in
...	...