Skip to content

Commit

Permalink
Merge pull request LilianeBifano#19 from LilianeBifano/corrige_campos
Browse files Browse the repository at this point in the history
Corrige campo de data
  • Loading branch information
mvbvieira authored Jul 27, 2018
2 parents 6ee425d + fe6d086 commit 9b11723
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/views/expenses/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<p> <%= erro %></p>
<% end %>
<%= simple_form_for @expense do |f| %>
<%= f.input :date, as: :date, html5: true %>
<%= f.input :date, as: :date, html5: true, input_html: {class: "col-md-3"} %>
<%= f.input :description%>
<%= f.input :value %>
<%= f.input :expense_type, priority: [ 'Alimentação' ], collection: @expense_types %>
<%= f.button :submit, 'Registrar' %>
<%= f.button :submit, 'Registrar' %>
<% end %>
</div>
2 changes: 1 addition & 1 deletion app/views/revenues/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p> <%= erro %></p>
<% end %>
<%= simple_form_for @revenue do |f| %>
<%= f.input :date, as: :date, html5: true %>
<%= f.input :date, as: :date, html5: true, input_html: {class: "col-md-3"} %>
<%= f.input :description%>
<%= f.input :value%>
<%= f.input :revenue_type, priority: [ 'Salário' ], collection: @revenue_types%>
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/simple_form_bootstrap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Use this setup block to configure all options available in SimpleForm.
SimpleForm.setup do |config|
# Default class for buttons
config.button_class = 'btn'
config.button_class = 'btn btn-primary'

# Define the default class of the input wrapper of the boolean input.
config.boolean_label_class = 'form-check-label'
Expand Down
1 change: 0 additions & 1 deletion spec/features/visit_home_index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
expect(page).not_to have_content('Minhas Configurações')
expect(page).not_to have_content('Inserir Gastos')
expect(page).not_to have_content('Inserir Ganhos')
expect(page).not_to have_content('Fechar o Mês')
end

scenario 'not view login' do
Expand Down

0 comments on commit 9b11723

Please sign in to comment.