Skip to content

Commit

Permalink
Remove supplementary courses from cs accelerator pages
Browse files Browse the repository at this point in the history
  • Loading branch information
croab committed Jun 3, 2024
1 parent 15998d3 commit a53fa39
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 94 deletions.
5 changes: 0 additions & 5 deletions app/models/pathway.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,4 @@ def recommended_activities_for_user(user)
user_activity_ids = user.achievements.map(&:activity_id)
recommended_activities.where.not(activity_id: user_activity_ids)
end

def supplementary_activities_for_user(user)
user_activity_ids = user.achievements.map(&:activity_id)
supplementary_activities.where.not(activity_id: user_activity_ids)
end
end
6 changes: 0 additions & 6 deletions app/view_objects/csa_dash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ def recommended_activities_for_user
@recommended_activities_for_user = user_programme_pathway&.recommended_activities_for_user(@user)
end

def supplementary_activities_for_user
return @supplementary_activities_for_user if defined? @supplementary_activities_for_user

@supplementary_activities_for_user = user_programme_pathway.supplementary_activities_for_user(@user)
end

def has_enough_activities_for_test
@has_enough_activities_for_test ||= @programme.enough_activities_for_test?(@user)
end
Expand Down
6 changes: 0 additions & 6 deletions app/views/certificates/cs_accelerator/complete.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@
)
} %>
</div>
<div class="govuk-body ncce-activity-list ncce-csa-dash__section">
<%= render partial: 'certificates/pathways/supplementary_courses', locals: {
pathway: @user_pathway,
supplementary_activities: @user_pathway&.supplementary_activities
} %>
</div>
<% else %>
<%= link_to t('.all_courses_button'),
courses_path(certificate: @programme.slug), class: 'govuk-button button',
Expand Down
9 changes: 0 additions & 9 deletions app/views/certificates/cs_accelerator/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@
</div>
</div>

<% if @csa_dash.user_programme_pathway.present? %>
<div class="govuk-body ncce-activity-list ncce-csa-dash__section">
<%= render partial: 'certificates/pathways/supplementary_courses', locals: {
pathway: @csa_dash.user_programme_pathway ,
supplementary_activities: @csa_dash.supplementary_activities_for_user
} %>
</div>
<% end %>

<% if @csa_dash.has_enough_activities_for_test %>
<%= render partial: 'certificates/cs_accelerator/csa-test', locals: {
user_programme_assessment: @csa_dash.user_programme_assessment
Expand Down
35 changes: 0 additions & 35 deletions app/views/certificates/pathways/_supplementary_courses.html.erb

This file was deleted.

19 changes: 0 additions & 19 deletions spec/models/pathway_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@
end
end

describe "#supplementary_activities" do
it "returns pathway_activities set as supplementary" do
create_list(:pathway_activity, 3, pathway: pathway, supplementary: false)
supplementary = create_list(:pathway_activity, 3, pathway: pathway, supplementary: true)
expect(pathway.supplementary_activities).to match_array(supplementary)
end
end

describe "#recommended_activities_for_user" do
it "returns pathway_activities not set as supplementary where user is not taking course" do
user = create(:user)
Expand All @@ -98,15 +90,4 @@
expect(pathway.recommended_activities_for_user(user)).to match_array(recommended)
end
end

describe "#supplementary_activities_for_user" do
it "returns pathway_activities set as supplementary where user is not taking course" do
user = create(:user)
activity = create(:activity)
create(:achievement, user: user, activity: activity)
create(:pathway_activity, pathway: pathway, activity: activity, supplementary: true)
supplementary = create_list(:pathway_activity, 3, pathway: pathway, supplementary: true)
expect(pathway.supplementary_activities_for_user(user)).to match_array(supplementary)
end
end
end
14 changes: 0 additions & 14 deletions spec/view_objects/csa_dash_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,6 @@
end
end

describe "#supplementary_activities_for_user" do
it "calls correct method on users pathway" do
allow(csa).to receive(:pathways_excluding)
pathway = instance_double(Pathway)
allow(pathway).to receive(:supplementary_activities_for_user)
allow(user).to receive(:programme_pathway) { pathway }

dash.supplementary_activities_for_user
expect(pathway)
.to have_received(:supplementary_activities_for_user)
.with(user)
end
end

describe "#has_enough_activities_for_test" do
it "calls method on programme" do
allow(csa).to receive(:enough_activities_for_test?)
Expand Down

0 comments on commit a53fa39

Please sign in to comment.