Download as
Browse Code »

Commit f6cf6d060ba049416ae5127d7ccedfbba3c6e35f

Authored by Heitor
Committed by Rafael Manzo
1 parent 360ddc34
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Fixed the acceptance tests 

Signed off by: Diego Araújo <diegoamc90@gmail.com>
Showing 3 changed files with 9 additions and 6 deletions   Show diff stats
app/views/repositories/_form.html.erb
  Diff comments   View file @f6cf6d0
... ... @@ -78,7 +78,7 @@
78 78  
79 79 <div class="form-row">
80 80 <div class="field-container">
81   - <%= f.label :configuration, 'Configuration', class: 'control-label' %>
  81 + <%= f.label :kalibro_configuration_id, 'Configuration', class: 'control-label' %>
82 82 <% configuration_list = KalibroClient::Entities::Configurations::KalibroConfiguration.all.map { |conf| [conf.name, conf.id] } %>
83 83 <%= f.select( :kalibro_configuration_id, configuration_list, class: 'tooltip-control' ) %>
84 84 </div>
... ...
app/views/repositories/show.html.erb
  Diff comments   View file @f6cf6d0
... ... @@ -36,9 +36,12 @@
36 36  
37 37 <%= form_tag(project_repository_state_with_date_path(@repository.project_id, @repository.id), method: "post", remote: true) do %>
38 38 <p>
39   - Day: <%= select_tag(:day, options_for_select(day_options), :style => "width:55px; margin-top:5px") %>
40   - Month: <%= select_tag(:month, options_for_select(month_options), :style => "width:55px; margin-top:5px") %>
41   - Year: <%= select_tag(:year, options_for_select(year_options), :style => "width:70px; margin-top:5px") %>
  39 + <%= label_tag :day, t("day") %>:
  40 + <%= select_tag(:day, options_for_select(day_options), :style => "width:55px; margin-top:5px") %>
  41 + <%= label_tag :month, t("month") %>:
  42 + <%= select_tag(:month, options_for_select(month_options), :style => "width:55px; margin-top:5px") %>
  43 + <%= label_tag :year, t("year") %>:
  44 + <%= select_tag(:year, options_for_select(year_options), :style => "width:70px; margin-top:5px") %>
42 45 <%= submit_tag("Search", class: 'btn btn-info', style: 'margin-bottom:5px', onClick: "Module.Repository.set_loader('#{image_tag 'loader.gif'} Loading data. Please, wait.')") %>
43 46 </p>
44 47 <% end %>
... ...
features/users/user_update.feature
  Diff comments   View file @f6cf6d0
... ... @@ -12,5 +12,5 @@ Feature: User update
12 12 And I fill the Name field with "Rafael Manzo"
13 13 And I fill the Current password field with "password"
14 14 And I press the Update button
15   - Then I should see "Your account has been updated successfully"
16   - And my name should have changed to Rafael Manzo
17 15 \ No newline at end of file
  16 + Then I should see "You updated your account successfully"
  17 + And my name should have changed to Rafael Manzo
... ...