sandsu

1) Customer should have no qunit errors
     Failure/Error: page.should have_selector("#qunit-testresult .failed", :text => "0")
       expected css "#qunit-testresult .failed" with text "0" to return something
     # ./spec/requests/customers_spec.rb:54:in `block (3 levels) in <top (required)>'
     # ./spec/requests/customers_spec.rb:53:in `block (2 levels) in <top (required)>'

  2) Customer should redirect to the right page when click on save and add guarantor
     Failure/Error: page.should have_selector("h6", :text => "Avalistas")
       expected css "h6" with text "Avalistas" to return something
     # ./spec/requests/customers_spec.rb:65:in `block (2 levels) in <top (required)>'

sandsu

<% if rand(5) % 4 == 1 %>
  <%= content_tag(:b, "beta", :class => "beta bubble") %>
<% elsif rand(5) % 4 == 1 %>
  <%= content_tag(:b, "pendente", :class => "payment bubble") %>
<% elsif rand(5) % 4 == 1 %>
  <%= content_tag(:b, "inativa", :class => "inactive bubble") %>
<% else %>
  <%= content_tag(:b, "em dia", :class => "bubble") %>
<% end %>

sandsu

https://gist.github.com/530fabd616db09139fb6

sandsu

Auto-merging app/views/home/dashboard.html.erb
CONFLICT (content): Merge conflict in app/views/home/dashboard.html.erb
Auto-merging app/controllers/mockups_controller.rb
Auto-merging app/assets/stylesheets/style.css.erb
Auto-merging app/assets/javascripts/script.js
Automatic merge failed; fix conflicts and then commit the result.

sandsu

~/workspace/credere(branch:dev) ? git checkout new_customers_form                                                                                                       sanderson@ssantana-mpb
Switched to a new branch 'new_customers_form'
------------------------------------------------------------
~/workspace/credere(branch:new_customers_form) ? git pull github new_customers_form                                                                                     sanderson@ssantana-mpb
From github.com:eita/credere
 * branch            new_customers_form -> FETCH_HEAD
Already up-to-date.

sandsu

~/workspace/credere(branch:dev) ? git merge new_customers_form                                                                                                          sanderson@ssantana-mpb
Auto-merging spec/requests/customers_spec.rb
Removing public/.DS_Store
Auto-merging app/views/proposals/_form.html.erb
CONFLICT (content): Merge conflict in app/views/proposals/_form.html.erb
Auto-merging app/views/customers/old_parentesco.html.erb
Auto-merging app/views/customers/old_informacoes_bancarias_complementares.html.erb
Auto-merging app/views/customers/old_informacoes_bancarias.html.erb
Auto-merging app/views/customers/old_dados_profissionais.html.erb
Auto-merging app/views/customers/old_cpf.html.erb

sandsu

./configure --prefix=$HOME/.rbenv/versions/1.9.3-p374 --with-opt-dir=/usr/local/lib --enable-shared --with-opt-dir=/usr/local/lib

sandsu

def resource_name
    :user
  end
 
  def resource
    @resource ||= User.new
  end
 
  def devise_mapping
    @devise_mapping ||= Devise.mappings[:user]

sandsu

1) Customer should have no qunit errors
     Failure/Error: page.should have_selector("#qunit-testresult .failed", :text => "0")
       expected css "#qunit-testresult .failed" with text "0" to return something
     # ./spec/requests/customers_spec.rb:56:in `block (3 levels) in <top (required)>'
     # ./spec/requests/customers_spec.rb:55:in `block (2 levels) in <top (required)>'

  2) Customer should redirect to the right page when click on save and add guarantor
     Failure/Error: page.should have_selector("h6", :text => "Cadastro de Avalista")
       expected css "h6" with text "Cadastro de Avalista" to return something
     # ./spec/requests/customers_spec.rb:71:in `block (2 levels) in <top (required)>'

sandsu

brew install imagemagick --disable-openmp --build-from-source