Skip to content

Commit

Permalink
[api] change request state to badge
Browse files Browse the repository at this point in the history
- Fixes #10238
- show state as badge to make it more consistent looking
- adjust Spec and test for badges
  • Loading branch information
hendrixfan committed Oct 2, 2020
1 parent 05702a9 commit bdc0773
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
4 changes: 3 additions & 1 deletion src/api/app/views/webui/request/_show_overview.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
%h3
Request #{bs_request.number} (#{bs_request.state})
Request #{bs_request.number}
%span.badge.ml-1{ class: "badge-#{request_badge_color(bs_request.state)}" }
= bs_request.state

#description-text
- if bs_request.description.present?
Expand Down
16 changes: 11 additions & 5 deletions src/api/spec/features/beta/webui/requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -121,7 +122,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -152,7 +154,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -185,7 +188,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand All @@ -204,7 +208,9 @@
fill_in 'Comment for reviewer:', with: 'Please review'
click_button('Accept')
expect(page).to have_text(/Open review for\s+#{reviewer.login}/)
expect(page).to have_text('Request 1 (review)')
expect(page).to have_text('Request 1')
expect(find('span.badge.badge-secondary')).to have_text('review')
expect(page).to have_text('In state review')
expect(Review.all.count).to eq(1)
logout

Expand Down
16 changes: 11 additions & 5 deletions src/api/spec/features/webui/requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -121,7 +122,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -152,7 +154,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand Down Expand Up @@ -185,7 +188,8 @@
visit request_show_path(bs_request)
click_button 'Accept'

expect(page).to have_text("Request #{bs_request.number} (accepted)")
expect(page).to have_text("Request #{bs_request.number}")
expect(find('span.badge.badge-success')).to have_text('accepted')
expect(page).to have_text('In state accepted')
end
end
Expand All @@ -204,7 +208,9 @@
fill_in 'Comment for reviewer:', with: 'Please review'
click_button('Accept')
expect(page).to have_text(/Open review for\s+#{reviewer.login}/)
expect(page).to have_text('Request 1 (review)')
expect(page).to have_text('Request 1')
expect(find('span.badge.badge-secondary')).to have_text('review')
expect(page).to have_text('In state review')
expect(Review.all.count).to eq(1)
logout

Expand Down

0 comments on commit bdc0773

Please sign in to comment.