Skip to content

Commit 646ff9d

Browse files
nevio18324RandomTannenbaum
authored andcommitted
rewrite test to check if skill is inside right category
1 parent 5f81ae3 commit 646ff9d

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

app/views/people/people_skills/index.html.haml

+12-11
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@
1111
= "(#{not_rated_default_skills(@person).count})"
1212
= close_action_link person_people_skills_path(@person, no_default_skill_prompt: "")
1313
- Category.all_parents.each do |category|
14-
%div.profile-header.mw-100.border-bottom.mt-4{id: category.title.parameterize, "data-scroll-target": "scrollItem"}
15-
= category.title
16-
- ([category] + category.children.to_a).each do |category_child|
17-
- not_rated_default_skills_of_category = not_rated_default_skills_of_category(@person, category_child)
18-
- if not_rated_default_skills_of_category.count > 0
19-
%div.white-header.mw-100.border-bottom.text-gray
20-
= category_child.title + " (#{not_rated_default_skills_of_category.count})"
21-
- not_rated_default_skills_of_category.each do |person_skill|
22-
- @person_skill = person_skill
23-
= form_with model: person_skill, url: person_people_skills_path(@person, rating: params["rating"]) do |form|
24-
= render "people/people_skills/edit_form", ff: form, show_category: true
14+
%div{id: "#{category.title.parameterize}-skills-container"}
15+
%div.profile-header.mw-100.border-bottom.mt-4{"data-scroll-target": "scrollItem"}
16+
= category.title
17+
- ([category] + category.children.to_a).each do |category_child|
18+
- not_rated_default_skills_of_category = not_rated_default_skills_of_category(@person, category_child)
19+
- if not_rated_default_skills_of_category.count > 0
20+
%div.white-header.mw-100.border-bottom.text-gray
21+
= category_child.title + " (#{not_rated_default_skills_of_category.count})"
22+
- not_rated_default_skills_of_category.each do |person_skill|
23+
- @person_skill = person_skill
24+
= form_with model: person_skill, url: person_people_skills_path(@person, rating: params["rating"]) do |form|
25+
= render "people/people_skills/edit_form", ff: form, show_category: true
2526
%div.align-items-center.mt-3
2627
= cancel_action_link person_people_skills_path(@person, no_default_skill_prompt: "")
2728
%div#person-skill-overview

spec/features/edit_people_skills_spec.rb

+5-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,11 @@ def not_rated_default_skills(person)
131131

132132
within '#default-skills' do
133133
not_rated_default_skills.each do |person_skill|
134-
expect(page).to have_content(person_skill.skill.title)
135-
expect(page).to have_content("#{person_skill.skill.category.parent.title} - #{person_skill.skill.category.title}")
134+
within "##{person_skill.skill.category.parent.title.parameterize}-skills-container" do
135+
expect(page).to have_content(person_skill.skill.category.parent.title)
136+
expect(page).to have_content(person_skill.skill.category.title)
137+
expect(page).to have_content(person_skill.skill.title)
138+
end
136139
end
137140

138141
expect(page).to have_content('Azubi', count: not_rated_default_skills.count)

0 commit comments

Comments
 (0)