Download as
Browse Code »

Commit caaa5b1302f3f82a6e7e3eab20ade0de104757b8

Authored by Rafael Manzo
2 parents 0851f743 a9f330af
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #182 from mezuro/fixing_kalibro_module_name 

Fixed kalibro module names on modules tree
Showing 4 changed files with 6 additions and 6 deletions   Show diff stats
@@ -154,7 +154,7 @@ GEM @@ -154,7 +154,7 @@ GEM
154 jquery-ui-rails (5.0.3) 154 jquery-ui-rails (5.0.3)
155 railties (>= 3.2.16) 155 railties (>= 3.2.16)
156 json (1.8.2) 156 json (1.8.2)
157 - kalibro_client (0.0.2) 157 + kalibro_client (0.0.3)
158 activesupport (>= 2.2.1) 158 activesupport (>= 2.2.1)
159 faraday_middleware (~> 0.9.0) 159 faraday_middleware (~> 0.9.0)
160 konacha (3.3.0) 160 konacha (3.3.0)
app/views/modules/_module_result.html.erb
  Diff comments   View file @caaa5b1
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 </td> 9 </td>
10 <td><%= module_result.kalibro_module.granularity %></td> 10 <td><%= module_result.kalibro_module.granularity %></td>
11 <td><%= format_grade(module_result.grade) %></td> 11 <td><%= format_grade(module_result.grade) %></td>
12 -</tr>  
13 \ No newline at end of file 12 \ No newline at end of file
  13 +</tr>
app/views/modules/_module_tree.html.erb
  Diff comments   View file @caaa5b1
@@ -28,4 +28,4 @@ @@ -28,4 +28,4 @@
28 </tbody> 28 </tbody>
29 </table> 29 </table>
30 <% end %> 30 <% end %>
31 -<% end %>  
32 \ No newline at end of file 31 \ No newline at end of file
  32 +<% end %>
features/step_definitions/repository_steps.rb
  Diff comments   View file @caaa5b1
@@ -95,7 +95,7 @@ When(/^I visit the repository show page$/) do @@ -95,7 +95,7 @@ When(/^I visit the repository show page$/) do
95 end 95 end
96 96
97 When(/^I click on the sample child's name$/) do 97 When(/^I click on the sample child's name$/) do
98 - click_link @module_result.children.first.kalibro_module.name 98 + click_link @module_result.children.first.kalibro_module.short_name
99 end 99 end
100 100
101 When(/^I click the "(.*?)" h3$/) do |text| 101 When(/^I click the "(.*?)" h3$/) do |text|
@@ -118,11 +118,11 @@ Then(/^I should see the sample repository name$/) do @@ -118,11 +118,11 @@ Then(/^I should see the sample repository name$/) do
118 end 118 end
119 119
120 Then(/^I should see the given module result$/) do 120 Then(/^I should see the given module result$/) do
121 - expect(page).to have_content(@module_result.kalibro_module.name) 121 + expect(page).to have_content(@module_result.kalibro_module.short_name)
122 end 122 end
123 123
124 Then(/^I should see a sample child's name$/) do 124 Then(/^I should see a sample child's name$/) do
125 - expect(page).to have_content(@module_result.children.first.kalibro_module.name) 125 + expect(page).to have_content(@module_result.children.first.kalibro_module.short_name)
126 end 126 end
127 127
128 Then(/^I should see the given repository's content$/) do 128 Then(/^I should see the given repository's content$/) do