{{title}}
- {{#if ENV.STUDENT_PLANNER_ENABLED}}
- {{#if todo_date}}
-
{{#t "wiki.todo_date"}}To-Do Date:{{/t}} {{tDateToString todo_date "date_at_time"}}
- {{/if}}
+ {{#if todo_date}}
+
{{#t "wiki.todo_date"}}To-Do Date:{{/t}} {{tDateToString todo_date "date_at_time"}}
{{/if}}
{{#if locked_for_user}}
diff --git a/config/feature_flags/00_standard.yml b/config/feature_flags/00_standard.yml
index 9120d47b3f3..c5028a316bb 100644
--- a/config/feature_flags/00_standard.yml
+++ b/config/feature_flags/00_standard.yml
@@ -296,12 +296,6 @@ new_user_tutorial:
description: Provide tutorial information for new users in a flyout tray.
applies_to: RootAccount
root_opt_in: true
-student_planner:
- state: 'on'
- display_name: To Do List Dashboard
- description: Provides users with a To Do List Dashboard option.
- applies_to: RootAccount
- root_opt_in: true
rubric_criterion_range:
state: allowed
display_name: Rubric Criterion Range
diff --git a/lib/api/v1/discussion_topics.rb b/lib/api/v1/discussion_topics.rb
index e5a245dcd7c..01d209e092f 100644
--- a/lib/api/v1/discussion_topics.rb
+++ b/lib/api/v1/discussion_topics.rb
@@ -131,9 +131,7 @@ module Api::V1::DiscussionTopics
json[:sections] = sections_json(topic.course_sections, user, session, section_includes)
end
- if topic.context.root_account.feature_enabled?(:student_planner)
- json[:todo_date] = topic.todo_date
- end
+ json[:todo_date] = topic.todo_date
if opts[:root_topic_fields] && opts[:root_topic_fields].length > 0
# If this is called from discussion_topics_api_json then we already
diff --git a/lib/api/v1/wiki_page.rb b/lib/api/v1/wiki_page.rb
index e05acb73313..fc5a0a485b1 100644
--- a/lib/api/v1/wiki_page.rb
+++ b/lib/api/v1/wiki_page.rb
@@ -36,9 +36,7 @@ module Api::V1::WikiPage
hash['hide_from_students'] = !hash['published'] # deprecated, but still here for now
hash['front_page'] = wiki_page.is_front_page?
hash['html_url'] = polymorphic_url([wiki_page.context, wiki_page])
- if wiki_page.context.root_account.feature_enabled?(:student_planner)
- hash['todo_date'] = wiki_page.todo_date
- end
+ hash['todo_date'] = wiki_page.todo_date
hash['updated_at'] = wiki_page.revised_at
if opts[:include_assignment] && wiki_page.for_assignment?
diff --git a/lib/planner_api_helper.rb b/lib/planner_api_helper.rb
index a46a9e6eb57..5af889c5986 100644
--- a/lib/planner_api_helper.rb
+++ b/lib/planner_api_helper.rb
@@ -49,10 +49,6 @@ module PlannerApiHelper
end
end
- def require_planner_enabled
- render json: { message: "Feature disabled" }, status: :forbidden unless @domain_root_account.feature_enabled?(:student_planner)
- end
-
def sync_module_requirement_done(item, user, complete)
return unless item.is_a?(ContextModuleItem)
doneable = mark_doneable_tag(item)
diff --git a/spec/apis/v1/discussion_topics_api_spec.rb b/spec/apis/v1/discussion_topics_api_spec.rb
index baa019d388d..e5b7b5a0d25 100644
--- a/spec/apis/v1/discussion_topics_api_spec.rb
+++ b/spec/apis/v1/discussion_topics_api_spec.rb
@@ -269,7 +269,6 @@ describe DiscussionTopicsController, type: :request do
end
it "should create a topic with all the bells and whistles" do
- @course.root_account.enable_feature!(:student_planner)
post_at = 1.month.from_now
lock_at = 2.months.from_now
todo_date = 1.day.from_now.change(sec: 0)
diff --git a/spec/apis/v1/pages_api_spec.rb b/spec/apis/v1/pages_api_spec.rb
index de2989eb5c1..c584f622cf2 100644
--- a/spec/apis/v1/pages_api_spec.rb
+++ b/spec/apis/v1/pages_api_spec.rb
@@ -214,8 +214,6 @@ describe "Pages API", type: :request do
end
context 'planner feature enabled' do
- before(:once) { @course.root_account.enable_feature!(:student_planner) }
-
it 'should create a page with a todo_date' do
todo_date = Time.zone.local(2008, 9, 1, 12, 0, 0)
json = api_call(:post, "/api/v1/courses/#{@course.id}/pages",
@@ -699,12 +697,11 @@ describe "Pages API", type: :request do
end
it 'should not crash updating front page if the wiki_page param is not available with student planner enabled' do
- @course.root_account.enable_feature!(:student_planner)
- response = api_call(:put, "/api/v1/courses/#{@course.id}/front_page",
- { :controller => 'wiki_pages_api', :action => 'update_front_page', :format => 'json', :course_id => @course.to_param,
- :url => @hidden_page.url },
- {}, {},
- {:expected_status => 200})
+ api_call(:put, "/api/v1/courses/#{@course.id}/front_page",
+ { :controller => 'wiki_pages_api', :action => 'update_front_page', :format => 'json', :course_id => @course.to_param,
+ :url => @hidden_page.url },
+ {}, {},
+ {:expected_status => 200})
end
it "should set as front page", priority:"3", test_id: 126813 do
diff --git a/spec/contracts/service_consumers/api/provider_states_for_consumer.rb b/spec/contracts/service_consumers/api/provider_states_for_consumer.rb
index 8e060e1e224..f2b414c1e1c 100644
--- a/spec/contracts/service_consumers/api/provider_states_for_consumer.rb
+++ b/spec/contracts/service_consumers/api/provider_states_for_consumer.rb
@@ -98,11 +98,6 @@ module Pact::Canvas
seed_users(opts)
@mobile_courses = seed_mobile
enable_default_developer_key!
- enable_features
- end
-
- def enable_features
- @account.enable_feature!(:student_planner)
end
def seed_course
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 7d254a0a7e9..72947cd488b 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -470,7 +470,6 @@ describe AccountsController do
it "should overwrite account users' existing dashboard_view if specified" do
account_with_admin_logged_in
@subaccount = @account.sub_accounts.create!
- @account.enable_feature! :student_planner
@account.save!
course_with_teacher(:account => @subaccount, :active_all => true)
diff --git a/spec/controllers/discussion_topics_controller_spec.rb b/spec/controllers/discussion_topics_controller_spec.rb
index 15739bc58b9..99716042923 100644
--- a/spec/controllers/discussion_topics_controller_spec.rb
+++ b/spec/controllers/discussion_topics_controller_spec.rb
@@ -978,26 +978,10 @@ describe DiscussionTopicsController do
end
context 'student planner' do
- before do
- @course.root_account.enable_feature!(:student_planner)
- end
-
before :each do
course_topic
end
- it 'js_env STUDENT_PLANNER_ENABLED is true for teachers' do
- user_session(@teacher)
- get :edit, params: {course_id: @course.id, id: @topic.id}
- expect(assigns[:js_env][:STUDENT_PLANNER_ENABLED]).to be true
- end
-
- it 'js_env STUDENT_PLANNER_ENABLED is false for students' do
- user_session(@student)
- get :edit, params: {course_id: @course.id, id: @topic.id}
- expect(assigns[:js_env][:STUDENT_PLANNER_ENABLED]).to be false
- end
-
it 'should create a topic with a todo date' do
user_session(@teacher)
todo_date = 1.day.from_now.in_time_zone('America/New_York')
diff --git a/spec/controllers/planner_controller_spec.rb b/spec/controllers/planner_controller_spec.rb
index ff5e3076368..d58452f7da5 100644
--- a/spec/controllers/planner_controller_spec.rb
+++ b/spec/controllers/planner_controller_spec.rb
@@ -48,7 +48,6 @@ describe PlannerController do
context "as student" do
before :each do
user_session(@student)
- @course.root_account.enable_feature!(:student_planner)
end
describe "GET #index" do
diff --git a/spec/controllers/planner_notes_controller_spec.rb b/spec/controllers/planner_notes_controller_spec.rb
index 47dd38fe705..5f6cbafe5c8 100644
--- a/spec/controllers/planner_notes_controller_spec.rb
+++ b/spec/controllers/planner_notes_controller_spec.rb
@@ -42,11 +42,6 @@ describe PlannerNotesController do
end
context "authenticated" do
- before :once do
- @course_1.root_account.enable_feature!(:student_planner)
- @course_2.root_account.enable_feature!(:student_planner)
- end
-
context "as student" do
before :each do
user_session(@student)
diff --git a/spec/controllers/planner_overrides_controller_spec.rb b/spec/controllers/planner_overrides_controller_spec.rb
index 1da9e394648..ceb90b792df 100644
--- a/spec/controllers/planner_overrides_controller_spec.rb
+++ b/spec/controllers/planner_overrides_controller_spec.rb
@@ -55,7 +55,6 @@ describe PlannerOverridesController do
context "as student" do
before :each do
user_session(@student)
- @course.root_account.enable_feature!(:student_planner)
end
describe "GET #index" do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 704d18dca26..fc935164ec2 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -2184,7 +2184,6 @@ describe UsersController do
context "with student planner feature enabled" do
before(:once) do
@account = Account.default
- @account.enable_feature! :student_planner
end
it "sets ENV.STUDENT_PLANNER_ENABLED to false when user has no student enrollments" do
diff --git a/spec/controllers/wiki_pages_controller_spec.rb b/spec/controllers/wiki_pages_controller_spec.rb
index 2e3613b010c..6dc4dabb5cd 100644
--- a/spec/controllers/wiki_pages_controller_spec.rb
+++ b/spec/controllers/wiki_pages_controller_spec.rb
@@ -74,39 +74,6 @@ describe WikiPagesController do
end
end
- describe "student planner" do
- before :once do
- course_with_teacher(active_all: true)
- @page = @course.wiki_pages.create!(title: "plan for planning the planner's planned plan... plan", body: "")
- end
-
- before do
- user_session @teacher
- end
-
- context "feature enabled" do
- before :once do
- @course.root_account.enable_feature! :student_planner
- end
-
- describe "GET 'index" do
- it "should render" do
- get 'index', params: {course_id: @course.id}
- expect(response).to be_successful
- expect(controller.js_env[:STUDENT_PLANNER_ENABLED]).to be_truthy
- end
- end
-
- describe "GET 'show" do
- it "should render" do
- get 'show', params: {course_id: @course.id, id: @page.url}
- expect(response).to be_successful
- expect(controller.js_env[:STUDENT_PLANNER_ENABLED]).to be_truthy
- end
- end
- end
- end
-
describe ':granular_permissions_wiki_pages in js_env' do
before do
course_with_teacher(active_all: true)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index f725f292100..89fae638fab 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -694,7 +694,6 @@ describe ApplicationHelper do
context "with planner enabled" do
before(:each) do
@account = Account.default
- @account.enable_feature! :student_planner
end
it "returns the list of groups the user belongs to" do
@@ -742,10 +741,6 @@ describe ApplicationHelper do
end
context "with student_planner feature flag enabled" do
- before(:each) do
- @domain_root_account.enable_feature! :student_planner
- end
-
it "returns false when a user has no student enrollments" do
course_with_teacher(:active_all => true)
@current_user = @user
diff --git a/spec/helpers/dashboard_helper_spec.rb b/spec/helpers/dashboard_helper_spec.rb
index 62f7c45efad..9e3f8e08c31 100644
--- a/spec/helpers/dashboard_helper_spec.rb
+++ b/spec/helpers/dashboard_helper_spec.rb
@@ -50,7 +50,6 @@ describe DashboardHelper do
end
it "should return 'planner' if set" do
- @course.root_account.enable_feature!(:student_planner)
@current_user.dashboard_view = 'planner'
@current_user.save!
expect(user_dashboard_view).to eq 'planner'
diff --git a/spec/lib/api/v1/assignment_spec.rb b/spec/lib/api/v1/assignment_spec.rb
index 7529202d3b5..cbf89c82f38 100644
--- a/spec/lib/api/v1/assignment_spec.rb
+++ b/spec/lib/api/v1/assignment_spec.rb
@@ -73,7 +73,6 @@ describe "Api::V1::Assignment" do
end
it "includes an associated planner override when flag is passed" do
- assignment.context.root_account.enable_feature!(:student_planner)
po = planner_override_model(user: user, plannable: assignment)
json = api.assignment_json(assignment, user, session,
{include_planner_override: true})
diff --git a/spec/lib/api/v1/planner_item_spec.rb b/spec/lib/api/v1/planner_item_spec.rb
index 785ab18c860..da80574f9bf 100644
--- a/spec/lib/api/v1/planner_item_spec.rb
+++ b/spec/lib/api/v1/planner_item_spec.rb
@@ -29,7 +29,6 @@ describe Api::V1::PlannerItem do
before :once do
course_factory active_all: true
- @course.root_account.enable_feature!(:student_planner)
teacher_in_course active_all: true
@reviewer = student_in_course(course: @course, active_all: true).user
diff --git a/spec/lib/api/v1/planner_override_spec.rb b/spec/lib/api/v1/planner_override_spec.rb
index 315d6a19d4b..a74f49466d9 100644
--- a/spec/lib/api/v1/planner_override_spec.rb
+++ b/spec/lib/api/v1/planner_override_spec.rb
@@ -24,8 +24,6 @@ describe Api::V1::PlannerOverride do
before :once do
course_factory active_all: true
- @course.root_account.enable_feature!(:student_planner)
-
student_in_course active_all: true
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8bfe3e30c59..cf381f339d2 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1805,7 +1805,6 @@ describe Account do
end
it "should add or overwrite all account users' dashboard_view preference" do
- @account.enable_feature!(:student_planner)
@account.default_dashboard_view = 'planner'
@account.save!
@account.reload
diff --git a/spec/selenium/calendar/calendar2_event_create_spec.rb b/spec/selenium/calendar/calendar2_event_create_spec.rb
index d1778e8d5f3..d6fb373cde2 100644
--- a/spec/selenium/calendar/calendar2_event_create_spec.rb
+++ b/spec/selenium/calendar/calendar2_event_create_spec.rb
@@ -211,7 +211,6 @@ describe "calendar2" do
context "to-do dates" do
before :once do
- Account.default.enable_feature!(:student_planner)
@course = Course.create!(name: "Course 1")
@course.offer!
@student1 = User.create!(name: 'Student 1')
diff --git a/spec/selenium/calendar/calendar2_with_planner_notes_spec.rb b/spec/selenium/calendar/calendar2_with_planner_notes_spec.rb
index 71bf82264c8..b88c1036d6a 100644
--- a/spec/selenium/calendar/calendar2_with_planner_notes_spec.rb
+++ b/spec/selenium/calendar/calendar2_with_planner_notes_spec.rb
@@ -23,7 +23,6 @@ describe "calendar2" do
include Calendar2Common
before(:once) do
- Account.default.enable_feature!(:student_planner)
course_with_teacher(active_all: true, new_user: true)
@student1 = User.create!(name: 'Student 1')
@course.enroll_student(@student1).accept!
diff --git a/spec/selenium/dashboard/planner/student_planner_assignments_spec.rb b/spec/selenium/dashboard/planner/student_planner_assignments_spec.rb
index 083c7e4034d..8b177b3f7a4 100644
--- a/spec/selenium/dashboard/planner/student_planner_assignments_spec.rb
+++ b/spec/selenium/dashboard/planner/student_planner_assignments_spec.rb
@@ -23,7 +23,6 @@ describe "student planner" do
include PlannerPageObject
before :once do
- Account.default.enable_feature!(:student_planner)
course_with_teacher(active_all: true, new_user: true, course_name: "Planner Course")
@student1 = User.create!(name: 'Student 1')
@course.enroll_student(@student1).accept!
diff --git a/spec/selenium/dashboard/planner/student_planner_graded_ungraded_discussion_spec.rb b/spec/selenium/dashboard/planner/student_planner_graded_ungraded_discussion_spec.rb
index 8ab9bfa023d..15736ca5ce8 100644
--- a/spec/selenium/dashboard/planner/student_planner_graded_ungraded_discussion_spec.rb
+++ b/spec/selenium/dashboard/planner/student_planner_graded_ungraded_discussion_spec.rb
@@ -23,7 +23,6 @@ describe "student planner" do
include PlannerPageObject
before :once do
- Account.default.enable_feature!(:student_planner)
course_with_teacher(active_all: true, new_user: true, course_name: "Planner Course")
@student1 = User.create!(name: 'Student First')
@course.enroll_student(@student1).accept!
diff --git a/spec/selenium/dashboard/planner/student_planner_spec.rb b/spec/selenium/dashboard/planner/student_planner_spec.rb
index c3066e8588f..c9c9369921e 100644
--- a/spec/selenium/dashboard/planner/student_planner_spec.rb
+++ b/spec/selenium/dashboard/planner/student_planner_spec.rb
@@ -25,7 +25,6 @@ describe "student planner" do
include PlannerPageObject
before :once do
- Account.default.enable_feature!(:student_planner)
course_with_teacher(active_all: true, new_user: true, user_name: 'PlannerTeacher', course_name: 'Planner Course')
@student1 = User.create!(name: 'Student 1')
@course.enroll_student(@student1).accept!
diff --git a/spec/selenium/dashboard/planner/teacher_planner_spec.rb b/spec/selenium/dashboard/planner/teacher_planner_spec.rb
index c84f0741fb0..e85b0e89e0b 100644
--- a/spec/selenium/dashboard/planner/teacher_planner_spec.rb
+++ b/spec/selenium/dashboard/planner/teacher_planner_spec.rb
@@ -23,7 +23,6 @@ describe "teacher planner" do
include PlannerPageObject
before :once do
- Account.default.enable_feature!(:student_planner)
course_with_teacher(active_all: true, new_user: true, user_name: 'PlannerTeacher', course_name: 'Planner Course')
@student1 = User.create!(name: 'Student 1')
@course.enroll_student(@student1).accept!