Download as
Browse Code »

Commit 520d772cb2751e89dff54e1257ba9754523e8547

Authored by Beatriz Rezener
Committed by Diego Camarinha
1 parent 5dd9ee46
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Substituting icon on range. Closes issue #57. 

Signed-off-by: João Gabriel <joaogabrieldebrittoesilva@gmail.com>
Signed-off-by: Beatriz Rezener <beatrizrezener@gmail.com>
Showing 4 changed files with 7 additions and 7 deletions   Show diff stats
app/assets/images/magnifying_glass.png
View file @5dd9ee4

1.23 KB
app/views/metric_configurations/_ranges.html.erb
  Diff comments   View file @520d772
1 <tr> 1 <tr>
2 <td> 2 <td>
3 <div> 3 <div>
4 - <a class="popover_element" rel="popover" data-placement="left" data-original-title="Comments" data-content="<%= mezuro_range.comments %>"><%= image_tag "magnifying_glass.png" %></a> 4 + <a class="popover_element" rel="popover" data-placement="left" data-original-title="Comments" data-content="<%= mezuro_range.comments %>"><span id="comment-icon" class="fa fa-comment"></span></a>
5 <span style="color: #<%= mezuro_range.color %>"><%= mezuro_range.label %></span> 5 <span style="color: #<%= mezuro_range.color %>"><%= mezuro_range.label %></span>
6 </div> 6 </div>
7 </td> 7 </td>
features/metric_configuration/show.feature
  Diff comments   View file @520d772
@@ -23,6 +23,6 @@ Feature: Show Metric Configuration @@ -23,6 +23,6 @@ Feature: Show Metric Configuration
23 And I have a sample metric configuration within the given mezuro configuration 23 And I have a sample metric configuration within the given mezuro configuration
24 And I have a sample range within the sample metric configuration 24 And I have a sample range within the sample metric configuration
25 And I am at the sample metric configuration page 25 And I am at the sample metric configuration page
26 - When I click the Magnifying glass image 26 + When I click the "comment-icon" icon
27 Then I should see "Comment" 27 Then I should see "Comment"
28 28
features/step_definitions/user_steps.rb
  Diff comments   View file @520d772
@@ -2,11 +2,6 @@ When(/^I click the (.+) link$/) do |text| @@ -2,11 +2,6 @@ When(/^I click the (.+) link$/) do |text|
2 click_link text 2 click_link text
3 end 3 end
4 4
5 -When(/^I click the (.+) image$/) do |image|  
6 - find(:xpath, "//a/img[@alt='#{image}']/..").click  
7 - sleep(1) #This sleep is essential to make the popup visible when we take a picture of the page  
8 -end  
9 -  
10 When(/^I press the (.+) button$/) do |text| 5 When(/^I press the (.+) button$/) do |text|
11 click_button text 6 click_button text
12 end 7 end
@@ -27,3 +22,8 @@ end @@ -27,3 +22,8 @@ end
27 When(/^I take a picture of the page$/) do 22 When(/^I take a picture of the page$/) do
28 page.save_screenshot("/tmp/picture.png") 23 page.save_screenshot("/tmp/picture.png")
29 end 24 end
  25 +
  26 +When(/^I click the "(.*?)" icon$/) do |icon|
  27 + find('#' + icon).click # the hashtag symbol is necessary to find the id of a HTML element
  28 + sleep(1) #This sleep is essential to make the popup visible when we take a picture of the page
  29 +end
30 \ No newline at end of file 30 \ No newline at end of file