Skip to content

Commit

Permalink
replace gradezilla with gradebook in rails
Browse files Browse the repository at this point in the history
refs TALLY-565

test plan:
 * Verify Jenkins passes

Change-Id: I6f7e18589688d7d9144a92503a5656f08a66fa95
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/227230
Tested-by: Service Cloud Jenkins <[email protected]>
Reviewed-by: Adrian Packel <[email protected]>
Reviewed-by: Spencer Olson <[email protected]>
QA-Review: Jeremy Neander <[email protected]>
Product-Review: Jeremy Neander <[email protected]>
  • Loading branch information
jneander committed Feb 20, 2020
1 parent 7111f9b commit c089810
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 71 deletions.
4 changes: 2 additions & 2 deletions app/controllers/gradebooks_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -975,11 +975,11 @@ def render_gradebook
end

def render_default_gradebook
render "gradebooks/gradezilla/gradebook"
render "gradebooks/gradebook"
end

def render_individual_gradebook
render "gradebooks/gradezilla/individual"
render "gradebooks/individual"
end

def percentage(weight)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

@import "base/environment";
@import "pages/shared/message_students.scss";
@import "pages/gradezilla/learning_outcome_gradebook.scss";
@import "pages/gradezilla/gradebook.scss";
@import "pages/gradezilla/grade_passback.scss";
@import "pages/gradebook/learning_outcome_gradebook.scss";
@import "pages/gradebook/gradebook.scss";
@import "pages/gradebook/grade_passback.scss";
@import "components/carousel.scss";
@import "components/grade_detail_tray.scss";
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@show_left_side = true
@collapse_course_menu = true
@show_embedded_chat = false
css_bundle :slickgrid, :gradezilla
js_bundle :gradezilla
css_bundle :slickgrid, :gradebook
js_bundle :gradebook
%>
<div id="keyboard_navigation"></div>
<div id="gradebook_wrapper">
Expand Down
File renamed without changes.
9 changes: 0 additions & 9 deletions doc/merging-gradezilla.md

This file was deleted.

2 changes: 1 addition & 1 deletion frontend_build/baseWebpackConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = {
'canvas-rce-old-async-chunk',
'permissions_index',
// The Gradebook bundles will be reduced in size as a part of GRADE-942.
'gradezilla',
'gradebook',
'screenreader_gradebook',
// This bundle got pushed over the limit by translations being added and
// the simplest fix was to ignore it at the moment, to unblock selenium
Expand Down
18 changes: 9 additions & 9 deletions spec/controllers/gradebooks_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -643,39 +643,39 @@ def check_grades_page(due_at)
it "renders default gradebook when preferred with 'default'" do
@admin.preferences[:gradebook_version] = "default"
get "show", params: { course_id: @course.id }
expect(response).to render_template("gradebooks/gradezilla/gradebook")
expect(response).to render_template("gradebooks/gradebook")
end

it "renders default gradebook when preferred with '2'" do
# most users will have this set from before New Gradebook existed
@admin.preferences[:gradebook_version] = "2"
get "show", params: { course_id: @course.id }
expect(response).to render_template("gradebooks/gradezilla/gradebook")
expect(response).to render_template("gradebooks/gradebook")
end

it "renders screenreader gradebook when preferred with 'individual'" do
@admin.preferences[:gradebook_version] = "individual"
get "show", params: { course_id: @course.id }
expect(response).to render_template("gradebooks/gradezilla/individual")
expect(response).to render_template("gradebooks/individual")
end

it "renders screenreader gradebook when preferred with 'srgb'" do
# most a11y users will have this set from before New Gradebook existed
@admin.preferences[:gradebook_version] = "srgb"
get "show", params: { course_id: @course.id }
expect(response).to render_template("gradebooks/gradezilla/individual")
expect(response).to render_template("gradebooks/individual")
end

it "renders default gradebook when user has no preference" do
get "show", params: { course_id: @course.id }
expect(response).to render_template("gradebooks/gradezilla/gradebook")
expect(response).to render_template("gradebooks/gradebook")
end

it "ignores the parameter version when not in development" do
allow(Rails.env).to receive(:development?).and_return(false)
@admin.preferences[:gradebook_version] = "default"
get "show", params: { course_id: @course.id, version: "individual" }
expect(response).to render_template("gradebooks/gradezilla/gradebook")
expect(response).to render_template("gradebooks/gradebook")
end
end

Expand All @@ -689,7 +689,7 @@ def check_grades_page(due_at)

it "renders default gradebook" do
get "show", params: { course_id: @course.id, version: "default" }
expect(response).to render_template("gradebooks/gradezilla/gradebook")
expect(response).to render_template("gradebooks/gradebook")
end
end

Expand All @@ -703,7 +703,7 @@ def check_grades_page(due_at)

it "renders screenreader gradebook" do
get "show", params: { course_id: @course.id, version: "individual" }
expect(response).to render_template("gradebooks/gradezilla/individual")
expect(response).to render_template("gradebooks/individual")
end
end

Expand Down Expand Up @@ -1077,7 +1077,7 @@ def check_grades_page(due_at)
it "redirects to Individual View with a friendly URL" do
@teacher.preferences[:gradebook_version] = "srgb"
get "show", params: {:course_id => @course.id}
expect(response).to render_template("gradebooks/gradezilla/individual")
expect(response).to render_template("gradebooks/individual")
end

it "requests groups without wiki_page assignments" do
Expand Down
22 changes: 0 additions & 22 deletions spec/selenium/grades/pages/gradezilla_cells_page.rb

This file was deleted.

23 changes: 0 additions & 23 deletions spec/selenium/grades/pages/gradezilla_page.rb

This file was deleted.

0 comments on commit c089810

Please sign in to comment.