4.3"
+gem "jekyll-theme-primer", "~> 0.6"
+
+group :jekyll_plugins do
+ gem "jekyll-feed", "~> 0.12"
+ gem "jekyll-seo-tag", "~> 2.8"
+end
+
+# Windows and JRuby does not include zoneinfo files
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+ gem "tzinfo", ">= 1", "< 3"
+ gem "tzinfo-data"
+end
diff --git a/docs/README.md b/docs/README.md
index 164b4f88..4908afa4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,63 +1,42 @@
----
-title: Flextensions - Assignment Extension Management for Canvas
-permalink: /
----
+# Flextensions Documentation
-
+This directory contains the source files for the Flextensions documentation site, served at [berkeley-cdss.github.io/flextensions](https://berkeley-cdss.github.io/flextensions).
-# Welcome to Flextensions 👋 [→][flextensions]
+The site is built with [Jekyll](https://jekyllrb.com/) and deployed automatically via GitHub Pages from the `docs/` directory on `main`.
-[**Flextensions**][flextensions] is your one-stop solution to manage and access assignment extensions across all your UC Berkeley courses*. Whether you're course staff or a student, Flextensions streamlines extension workflows and makes extension data easy to access and manage.
+## Local Development
-_* Well, all of your courses which use bCourses and enable assignment extensions. :)_
+```bash
+cd docs
+bundle install
+bundle exec jekyll serve
+```
-[flextensions]: https://flextensions.berkeley.edu
+Then visit http://localhost:4000/flextensions/.
----
+## Directory Structure
-## 🚀 What Does Flextensions Do?
+- `*.md` — Documentation pages (each has YAML front matter with `title` and `permalink`)
+- `_config.yml` — Jekyll configuration
+- `api/` — Swagger/OpenAPI reference (static HTML, not processed by Jekyll)
+- `img/` — Images used in documentation
+- `_site/` — Generated output (gitignored)
-### [🧑🏫 For Course Staff](/flextensions/instructors/):
-- View and manage extensions requests for all assignments in your course.
-- Grant extensions to students with a few clicks.
-- Monitor extension usage across your course.
-- Automate approving extension requests and email sending
+## Adding a Page
-### [🎓 For Students](/flextensions/students/):
-- View all your granted extensions in one place.
-- See how long your extension lasts and when the new due date is.
-- Stay informed and organized without checking multiple systems.
+Create a new `.md` file with front matter:
+```markdown
---
-
-## 🔧 How It Works
-
-Flextensions connects directly with bCourses (Canvas) and imports your assignments. The interface is intuitive and role-based—course staff can grant and manage, while students can view.
-
+title: Your Page Title
+permalink: /your-page/
---
-Are you a developer? Check out the [Developer Documentation](/flextensions/developers/) documention to contribute to Flextensions and the [API Reference](/flextensions/api/) to learn how to integrate Flextensions with your own applications.
-
----
-
-## Credits
-
-Flextensions was originally developed by students in [CS169L](https://saasbook.info), during the Spring 2024 and Spring 2025 semesters, as part of the [Software as a Service](https://saasbook.info) course at UC Berkeley.
-
-Student developers (in alphabetical order):
+Content here...
+```
-* Connor Bernard, Spring 2024
-* Cynthia Lixinyi, Spring 2024
-* [Diandian Liu](https://www.linkedin.com/in/diandian-liu/), Spring 2025
-* [Eric Huang](https://huanger2.github.io), Spring 2025
-* Evan Kandell, Spring 2024
-* Sepehr Behmanesh Fard, Spring 2024
-* [Tashrique Ahmed](https://tashrique.com), Spring 2025
-* [Tianye Meng](https://www.linkedin.com/in/tianye-meng-611b22253/), Spring 2025
-* [Yaman Tarakji](https://www.linkedin.com/in/yaman-tarakji-602530196), Spring 2025
-* Zee Babar, Spring 2024
+Internal links should use absolute paths starting with `/flextensions/`, e.g. `[Developers](/flextensions/developers/)`.
-[Michael Ball][mball], Armando Fox, and Lisa Yan are the faculty members who have overseen the development of Flextensions.
+## CI
-[mball]: https://mball.co/
+The `Docs Build` workflow (`.github/workflows/docs.yml`) validates the Jekyll build and checks for broken internal links on PRs that touch `docs/`.
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..72f64c12
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,27 @@
+title: Flextensions
+description: Assignment Extension Management for Canvas
+baseurl: /flextensions
+url: https://berkeley-cdss.github.io
+
+# Build settings
+markdown: kramdown
+theme: jekyll-theme-primer
+
+# Exclude from processing
+exclude:
+ - Gemfile
+ - Gemfile.lock
+ - README.md
+ - .jekyll-cache
+ - _site
+
+# Include the API docs (static HTML)
+include:
+ - api
+
+# Default front matter
+defaults:
+ - scope:
+ path: ""
+ values:
+ layout: default
diff --git a/docs/developers.md b/docs/developers.md
index ed871377..ecd367c5 100644
--- a/docs/developers.md
+++ b/docs/developers.md
@@ -1,7 +1,6 @@
---
title: Developing Flextensions
permalink: /developers/
-published: false
---
# Standing Up the Application
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..853cf4ac
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,71 @@
+---
+title: Flextensions - Assignment Extension Management for Canvas
+permalink: /
+---
+
+
+
+# Welcome to Flextensions 👋 [→][flextensions]
+
+[**Flextensions**][flextensions] is your one-stop solution to manage and access assignment extensions across all your UC Berkeley courses*. Whether you're course staff or a student, Flextensions streamlines extension workflows and makes extension data easy to access and manage.
+
+_* Well, all of your courses which use bCourses or Gradescope and enable assignment extensions. :)_
+
+[flextensions]: https://flextensions.berkeley.edu
+
+---
+
+## 🚀 What Does Flextensions Do?
+
+### [🧑🏫 For Course Staff](/flextensions/instructors/):
+- View and manage extensions requests for all assignments in your course.
+- Grant extensions to students with a few clicks.
+- Monitor extension usage across your course.
+- Automate approving extension requests and email sending
+- Use as an [API](/docs/api/index.html) to integrate with your own tools and systems.
+
+### [🎓 For Students](/flextensions/students/):
+- View all your granted extensions in one place.
+- See how long your extension lasts and when the new due date is.
+- Stay informed and organized without checking multiple systems.
+
+---
+
+## 🔧 How It Works
+
+Flextensions connects directly with bCourses (Canvas) and imports your assignments. The interface is intuitive and role-based—course staff can grant and manage, while students can view.
+
+---
+
+Are you a developer? Check out the [Developer Documentation](/flextensions/developers/) documention to contribute to Flextensions and the [API Reference](/flextensions/api/) to learn how to integrate Flextensions with your own applications.
+
+Want to know what's new? See the [Updates page](/flextensions/updates/) for recent changes or visit the [GitHub Releases](https://github.com/berkeley-cdss/flextensions/releases) for a full changelog.
+
+Interested in the research behind Flextensions? Check out the [Research page](/flextensions/research/).
+
+---
+
+## Credits
+
+Flextensions is currently maintained by [Michael Ball][mball], [Continuing Lecturer in EECS][mb_eecs]. It has been developed by students in [CS169L](https://saasbook.info), during the Spring 2024, 2025 and 2026 semesters, as part of the [Software as a Service](https://saasbook.info) course at UC Berkeley.
+
+The Flextensions project has been generously supported by the [Research, Teaching, and Learning](https://teaching.berkeley.edu) and the [Office of the Vice Provost for Undergraduate Education](https://ue.berkeley.edu) at UC Berkeley through the [Seamless Learning Project](https://berkeley-cdss.github.io/seamless-learning/).
+
+Student developers (in alphabetical order):
+
+* Connor Bernard, Spring 2024
+* Cynthia Lixinyi, Spring 2024
+* [Diandian Liu](https://www.linkedin.com/in/diandian-liu/), Spring 2025
+* [Eric Huang](https://huanger2.github.io), Spring 2025
+* Evan Kandell, Spring 2024
+* Sepehr Behmanesh Fard, Spring 2024
+* [Tashrique Ahmed](https://tashrique.com), Spring 2025
+* [Tianye Meng](https://www.linkedin.com/in/tianye-meng-611b22253/), Spring 2025
+* [Yaman Tarakji](https://www.linkedin.com/in/yaman-tarakji-602530196), Spring 2025
+* Zee Babar, Spring 2024
+
+Armando Fox, and Lisa Yan are faculty members who have also overseen the development of Flextensions and make significant contributions to the project.
+
+[mball]: https://mball.co/
+[mb_eecs]: https://www.eecs.berkeley.edu/Faculty/Homepages/mball.html
diff --git a/docs/instructors.md b/docs/instructors.md
index 7e120468..d5fb9e1d 100644
--- a/docs/instructors.md
+++ b/docs/instructors.md
@@ -28,7 +28,7 @@ On the **Courses** page, click a blue course name (e.g., **CS 161**, **CS 168**)
### Syncing Assignments
-If you have added new assignments in Canvas, you can click **Sync Assignments** to import the latest assignments from Canvas into Flextensions.
+If you have added new assignments in Canvas (or Gradescope, if configured), you can click **Sync Assignments** to import the latest assignments into Flextensions.
### Enabling Assignments
@@ -83,7 +83,7 @@ The **Enrollments** tab shows all instructors and students currently associated
The list will refresh with updated data, including new students and instructors, and will remove users no longer in the course.
> [!NOTE]
-> ⚠️ If if a student is added to the course after you have already imported a course, you will need to sync the course enrollments to ensure they are able to access the Flextensions course.
+> ⚠️ If a student is added to the course after you have already imported a course, you will need to sync the course enrollments to ensure they are able to access the Flextensions course.
## Filtering Student Requests
By clicking the name of a student in the **Enrollments** tab, you can filter the requests to only show those made by that student. This is useful for quickly reviewing all requests from a specific student.
@@ -99,14 +99,35 @@ Control when and how requests are automatically approved:
- **Auto-approve within days**
Automatically approves requests made within the specified number of days before the assignment due date. Leave blank to disable.
-
+- **Auto-approve within days (Ex)**
+ Applies a similar rule specifically to students with a DSP accommodation flag.
- **Maximum requests to auto-approve**
Sets a per-student limit on auto-approved requests. Use `0` for no limit.
After setting these options, click **Save Settings** to save.
+### Extend Late Due Date Automatically
+
+_This setting is enabled by default._
+
+When enabled, the late due date will be automatically extended by the same amount of time as the original extension when an extension is granted. This setting can be toggled on or off by instructors.
+
+If you use "Slip Days" or otherwise accept late submissions you can enable this, so students who go beyond their extended due date will have the option to submit late work until the late due date.
+
+You may wish to disable this if you do not want students to have the option to submit late work, or if you set the late due date to a very distant date (e.g., end of semester) and do not want it to be extended further.
+
+If you do not set late due dates (assignment close date in Canvas), this setting will have no effect.
+
+## Gradescope Integration
+
+If you use Gradescope for grading, you can integrate it with Flextensions to automatically sync extension data.
+
+* You must invite the user `gradescope-bot@berkeley.edu` as a TA (or Reader) in your Gradescope course to enable this integration.
+* Paste the URL of your Gradescope course into the **Gradescope Course URL** field in the Settings tab.
+* Click **Save Settings** to enable the integration.
+* Sync assignments to pull in the latest data from Gradescope.
+
## Course Email Settings
The **Email Settings** section (under Settings) controls how students receive notifications about their extension requests.
@@ -177,13 +198,13 @@ Once configured, click **Update** at the bottom of the page to save your setting
---
-## [Integration Guide](/integrations)
+## [Integration Guide](/flextensions/integrations/)
Flextensions supports integrations with:
* Slack Webhooks
* Google Sheets
-* Gradescope (coming soon!)
+* Gradescope
---
diff --git a/docs/research.md b/docs/research.md
new file mode 100644
index 00000000..527e5e1d
--- /dev/null
+++ b/docs/research.md
@@ -0,0 +1,32 @@
+---
+title: Research
+permalink: /research/
+---
+
+# Research
+
+We publish research and experience reports on the use of Flextensions in the classroom.
+
+## Citation
+If you use Flextensions in your research, please cite the tool itself using the following DOI:
+
+https://doi.org/10.5281/zenodo.17246291
+
+```
+# IEEE
+[1]M. Ball, “Flextensions”. Zenodo, Aug. 20, 2025. doi: 10.5281/zenodo.17246291.
+
+# APA
+Ball, M., Fox, A., Yan, L., huanger2, Yaman Tarakji, Tashrique Ahmed, Connor, Jerry, Cynthia Xinyi Li, Tianye Meng, Peter Tran, Dana Kim, andypumpkineater, Evan Kandell, dg-ucb, Sepehr Behmanesh, felder, & Zee Babar. (2025). Flextensions. Zenodo.
+https://doi.org/10.5281/zenodo.17246291
+```
+
+## Publications
+
+**Automated Support for Flexible Extensions**
+
+Poster. Jordan Schwartz, Madison Bohannan, Jacob Yim, Yuerou Tang, Dana Benedicto, Charisse Liu, Armando Fox, Lisa Yan, and Narges Norouzi. 2024. Automated Support for Flexible Extensions. In Proceedings of the 55th ACM Technical Symposium on Computer Science Education V. 2 (SIGCSE 2024), March 20–23, 2024, Portland, OR, USA. ACM, New York, NY, USA, 2 pages. https://doi.org/10.1145/3626253.3635628
+
+**Supporting Mastery Learning with Flexible Extensions**
+
+Poster. Yuerou Tang, Jacob Yim, Jordan Schwartz, Madison Bohannan, Dana Benedicto, Charisse Liu, Armando Fox, Lisa Yan, and Narges Norouzi. 2024. Supporting Mastery Learning with Flexible Extensions. In Proceedings of the 55th ACM Technical Symposium on Computer Science Education V. 2 (SIGCSE 2024), March 20–23, 2024, Portland, OR, USA. ACM, New York, NY, USA, 2 pages. https://doi.org/10.1145/3626253.3635615
diff --git a/docs/updates.md b/docs/updates.md
new file mode 100644
index 00000000..bf41d842
--- /dev/null
+++ b/docs/updates.md
@@ -0,0 +1,29 @@
+---
+title: Flextensions Updates
+permalink: /updates/
+---
+
+# Flextensions Updates
+
+This page highlights major updates and changes to Flextensions.
+For a complete list of releases, see the [GitHub Releases page](https://github.com/berkeley-cdss/flextensions/releases).
+
+---
+
+## February 27, 2026 — Better Late Due Date Support
+
+Auto-extend the late due date by the same amount of time as the original extension when an extension is granted. This setting can be enabled or disabled by instructors.
+
+## November 15, 2025 — Gradescope Integration
+
+Added support for Gradescope.
+
+## August 16, 2025 — Initial Release
+
+Flextensions launched for the Fall 2025 semester! 🎉
+
+- Students can log in via bCourses and view all their granted extensions in one place.
+- Course staff can view and manage extension requests for all assignments in their course.
+- Instructors can grant extensions to students with a few clicks.
+- Automated email notifications are sent when extensions are granted.
+- Slack notifications are supported for new extension requests.
diff --git a/info.yml b/info.yml
new file mode 100644
index 00000000..6f546bff
--- /dev/null
+++ b/info.yml
@@ -0,0 +1,28 @@
+project:
+ name: 'Flextensions'
+ owner: 'CS169L-23'
+ teamId: '02'
+ identities: {}
+ notifications:
+ email: 'basimalharbi@berkeley.edu, igormoyzeson@berkeley.edu, nizamian@berkeley.edu, alexander.stepanov@berkeley.edu, anthonydam@berkeley.edu'
+ members:
+ member1:
+ name: 'Basim'
+ surname: 'AlHarbi'
+ githubUsername: 'ba88im'
+ member2:
+ name: 'Igor'
+ surname: 'Moyzeson'
+ githubUsername: 'Shklalom'
+ member3:
+ name: 'Noah'
+ surname: 'Nizamian'
+ githubUsername: 'noahnizamian'
+ member4:
+ name: 'Alexander'
+ surname: 'Stepanov'
+ githubUsername: 'alxstx'
+ member5:
+ name: 'Anthony'
+ surname: 'Dam'
+ githubUsername: 'gobears01'
diff --git a/lib/tasks/backfill_extend_late_due_date.rake b/lib/tasks/backfill_extend_late_due_date.rake
new file mode 100644
index 00000000..098d4b0c
--- /dev/null
+++ b/lib/tasks/backfill_extend_late_due_date.rake
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+namespace :course_settings do
+ desc 'Backfill extend_late_due_date setting for all existing courses (sets to true for all courses)'
+ task backfill_extend_late_due_date: :environment do
+ puts 'Starting backfill of extend_late_due_date setting for all courses...'
+
+ total_courses = Course.count
+ updated_count = 0
+ skipped_count = 0
+ created_count = 0
+
+ Course.find_each do |course|
+ if course.course_settings.nil?
+ # Create course settings if they don't exist
+ CourseSettings.create!(course: course, extend_late_due_date: true)
+ created_count += 1
+ puts "Created course settings for course #{course.id} (#{course.course_name})"
+ elsif course.course_settings.extend_late_due_date.nil?
+ # Update existing course settings if extend_late_due_date is nil
+ course.course_settings.update!(extend_late_due_date: true)
+ updated_count += 1
+ puts "Updated course #{course.id} (#{course.course_name})"
+ else
+ skipped_count += 1
+ end
+ end
+
+ puts "\nBackfill complete!"
+ puts "Total courses: #{total_courses}"
+ puts "Settings created: #{created_count}"
+ puts "Settings updated: #{updated_count}"
+ puts "Skipped (already set): #{skipped_count}"
+ end
+end
diff --git a/package-lock.json b/package-lock.json
index 5d86cbbb..e4c8b9e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -250,27 +250,6 @@
"node": ">=10.10.0"
}
},
- "node_modules/@isaacs/balanced-match": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
- "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
- "dev": true,
- "engines": {
- "node": "20 || >=22"
- }
- },
- "node_modules/@isaacs/brace-expansion": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
- "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
- "dev": true,
- "dependencies": {
- "@isaacs/balanced-match": "^4.0.1"
- },
- "engines": {
- "node": "20 || >=22"
- }
- },
"node_modules/@isaacs/cliui": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1241,10 +1220,13 @@
}
},
"node_modules/dompurify": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.0.tgz",
- "integrity": "sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
+ "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
"dev": true,
+ "engines": {
+ "node": ">=20"
+ },
"optionalDependencies": {
"@types/trusted-types": "^2.0.7"
}
@@ -1403,10 +1385,22 @@
}
]
},
+ "node_modules/fast-xml-builder": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
+ "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ]
+ },
"node_modules/fast-xml-parser": {
- "version": "4.5.3",
- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
- "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
+ "integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
"dev": true,
"funding": [
{
@@ -1415,7 +1409,8 @@
}
],
"dependencies": {
- "strnum": "^1.1.1"
+ "fast-xml-builder": "^1.0.0",
+ "strnum": "^2.1.2"
},
"bin": {
"fxparser": "src/cli/cli.js"
@@ -1949,20 +1944,41 @@
}
},
"node_modules/minimatch": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
- "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+ "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
"dev": true,
"dependencies": {
- "@isaacs/brace-expansion": "^5.0.0"
+ "brace-expansion": "^5.0.2"
},
"engines": {
- "node": "20 || >=22"
+ "node": "18 || 20 || >=22"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/minimatch/node_modules/balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "dev": true,
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/minimatch/node_modules/brace-expansion": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+ "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
"node_modules/minimist": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
@@ -2201,13 +2217,13 @@
}
},
"node_modules/openapi-sampler": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.6.2.tgz",
- "integrity": "sha512-NyKGiFKfSWAZr4srD/5WDhInOWDhfml32h/FKUqLpEwKJt0kG0LGUU0MdyNkKrVGuJnw6DuPWq/sHCwAMpiRxg==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.7.0.tgz",
+ "integrity": "sha512-fWq32F5vqGpgRJYIarC/9Y1wC9tKnRDcCOjsDJ7MIcSv2HsE7kNifcXIZ8FVtNStBUWxYrEk/MKqVF0SwZ5gog==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.7",
- "fast-xml-parser": "^4.5.0",
+ "fast-xml-parser": "^5.3.4",
"json-pointer": "0.6.2"
}
},
@@ -2593,9 +2609,9 @@
}
},
"node_modules/redoc/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "version": "5.1.9",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+ "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
@@ -2910,9 +2926,9 @@
}
},
"node_modules/strnum": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
- "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
+ "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
"dev": true,
"funding": [
{
@@ -3053,9 +3069,9 @@
}
},
"node_modules/undici": {
- "version": "6.22.0",
- "resolved": "https://registry.npmjs.org/undici/-/undici-6.22.0.tgz",
- "integrity": "sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==",
+ "version": "6.24.0",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.0.tgz",
+ "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
"dev": true,
"engines": {
"node": ">=18.17"
@@ -3498,21 +3514,6 @@
"integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
"dev": true
},
- "@isaacs/balanced-match": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
- "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
- "dev": true
- },
- "@isaacs/brace-expansion": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
- "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
- "dev": true,
- "requires": {
- "@isaacs/balanced-match": "^4.0.1"
- }
- },
"@isaacs/cliui": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -4248,9 +4249,9 @@
"dev": true
},
"dompurify": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.0.tgz",
- "integrity": "sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
+ "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
"dev": true,
"requires": {
"@types/trusted-types": "^2.0.7"
@@ -4366,13 +4367,20 @@
"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
"dev": true
},
+ "fast-xml-builder": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
+ "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
+ "dev": true
+ },
"fast-xml-parser": {
- "version": "4.5.3",
- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
- "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
+ "integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
"dev": true,
"requires": {
- "strnum": "^1.1.1"
+ "fast-xml-builder": "^1.0.0",
+ "strnum": "^2.1.2"
}
},
"fill-range": {
@@ -4756,12 +4764,29 @@
}
},
"minimatch": {
- "version": "10.1.1",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
- "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+ "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
"dev": true,
"requires": {
- "@isaacs/brace-expansion": "^5.0.0"
+ "brace-expansion": "^5.0.2"
+ },
+ "dependencies": {
+ "balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "dev": true
+ },
+ "brace-expansion": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+ "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^4.0.2"
+ }
+ }
}
},
"minimist": {
@@ -4913,13 +4938,13 @@
"dev": true
},
"openapi-sampler": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.6.2.tgz",
- "integrity": "sha512-NyKGiFKfSWAZr4srD/5WDhInOWDhfml32h/FKUqLpEwKJt0kG0LGUU0MdyNkKrVGuJnw6DuPWq/sHCwAMpiRxg==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.7.0.tgz",
+ "integrity": "sha512-fWq32F5vqGpgRJYIarC/9Y1wC9tKnRDcCOjsDJ7MIcSv2HsE7kNifcXIZ8FVtNStBUWxYrEk/MKqVF0SwZ5gog==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.7",
- "fast-xml-parser": "^4.5.0",
+ "fast-xml-parser": "^5.3.4",
"json-pointer": "0.6.2"
}
},
@@ -5201,9 +5226,9 @@
}
},
"minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "version": "5.1.9",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+ "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
"dev": true,
"requires": {
"brace-expansion": "^2.0.1"
@@ -5439,9 +5464,9 @@
}
},
"strnum": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
- "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
+ "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
"dev": true
},
"styled-components": {
@@ -5539,9 +5564,9 @@
"optional": true
},
"undici": {
- "version": "6.22.0",
- "resolved": "https://registry.npmjs.org/undici/-/undici-6.22.0.tgz",
- "integrity": "sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==",
+ "version": "6.24.0",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.0.tgz",
+ "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
"dev": true
},
"undici-types": {
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index 65b85f6d..6acae4d2 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -111,6 +111,61 @@
end
end
+ describe 'GET #omniauth_callback (developer provider)' do
+ let(:dev_auth_hash) do
+ OmniAuth::AuthHash.new(
+ provider: 'developer',
+ uid: 'test@example.com',
+ info: OpenStruct.new(name: 'Test Developer', email: 'test@example.com'),
+ credentials: {
+ token: 'dev-token',
+ refresh_token: nil,
+ expires_at: nil
+ }
+ )
+ end
+
+ before do
+ request.env['omniauth.auth'] = dev_auth_hash
+ end
+
+ context 'developer provider login with missing credentials' do
+ it 'handles nil credentials gracefully' do
+ get :omniauth_callback, params: { provider: 'developer' }
+
+ user = User.find_by(canvas_uid: 'test@example.com')
+ expect(user).to be_present
+ expect(user.email).to eq('test@example.com')
+
+ expect(session[:user_id]).to eq('test@example.com')
+ expect(response).to redirect_to(courses_path)
+ end
+
+ # test course for dev login
+ it 'auto-enrolls developer login users in test course' do
+ test_course = Course.create!(course_code: 'DEV101', course_name: 'Test Course', canvas_id: 'dev-001')
+
+ get :omniauth_callback, params: { provider: 'developer' }
+
+ user = User.find_by(canvas_uid: 'test@example.com')
+ enrollment = UserToCourse.find_by(user_id: user.id, course_id: test_course.id)
+
+ expect(enrollment).to be_present
+ expect(enrollment.role).to eq('student')
+ end
+
+ it 'stores fake refresh token for developer provider' do
+ get :omniauth_callback, params: { provider: 'developer' }
+
+ user = User.find_by(canvas_uid: 'test@example.com')
+ creds = user.lms_credentials.first
+
+ expect(creds.refresh_token).to be_present
+ expect(creds.token).to be_present
+ end
+ end
+ end
+
describe 'GET #logout' do
before do
session[:user_id] = 'test_user_id'
diff --git a/spec/facades/canvas_facade_spec.rb b/spec/facades/canvas_facade_spec.rb
index e7d72575..94a966a3 100644
--- a/spec/facades/canvas_facade_spec.rb
+++ b/spec/facades/canvas_facade_spec.rb
@@ -361,6 +361,38 @@
expect(result).to be_a(Lmss::Canvas::Override)
end
+ it 'passes nil for close_date (lock_at) when late due date is not provided' do
+ expect(facade).to receive(:create_assignment_override).with(
+ course_id, assignment_id, [ student_id ],
+ "#{student_id} extended to #{mock_date}",
+ mock_date, mock_date, nil
+ ).and_return(create_success_response)
+
+ facade.provision_extension(
+ course_id,
+ student_id,
+ assignment_id,
+ mock_date
+ )
+ end
+
+ it 'uses the close_date (late due date) for lock_at when provided' do
+ close_date = '2002-03-20T16:00:00Z'
+ expect(facade).to receive(:create_assignment_override).with(
+ course_id, assignment_id, [ student_id ],
+ "#{student_id} extended to #{mock_date}",
+ mock_date, mock_date, close_date
+ ).and_return(create_success_response)
+
+ facade.provision_extension(
+ course_id,
+ student_id,
+ assignment_id,
+ mock_date,
+ close_date
+ )
+ end
+
it 'throws a pipeline error if the creation response body is improperly formatted' do
allow(facade).to receive(:create_assignment_override).and_return(create_invalid_json_response)
expect do
@@ -397,7 +429,7 @@
"#{student_id} extended to #{mock_date}",
mock_date,
mock_date,
- mock_date
+ nil
).and_return(instance_double(Faraday::Response, body: '{}'))
facade.provision_extension(
course_id,
@@ -407,6 +439,29 @@
)
end
+ it 'passes close_date to update when updating existing override' do
+ close_date = '2002-03-20T16:00:00Z'
+ allow(facade).to receive(:create_assignment_override).and_return(create_taken_response)
+ expect(facade).to receive(:get_existing_student_override).twice.and_return(OpenStruct.new(mock_override))
+ expect(facade).to receive(:update_assignment_override).with(
+ course_id,
+ assignment_id,
+ mock_override[:id],
+ mock_override[:student_ids],
+ "#{student_id} extended to #{mock_date}",
+ mock_date,
+ mock_date,
+ close_date
+ ).and_return(instance_double(Faraday::Response, body: '{}'))
+ facade.provision_extension(
+ course_id,
+ student_id,
+ assignment_id,
+ mock_date,
+ close_date
+ )
+ end
+
it 'creates a new override if the student\'s existing one has multiple other students' do
mock_override[:student_ids].append(student_id + 1)
mock_override_struct = OpenStruct.new(mock_override)
@@ -475,6 +530,24 @@
assignment_id
)).to be_nil
end
+
+ it 'skips overrides with nil student_ids' do
+ mock_override_nil_students = mock_override.clone
+ mock_override_nil_students[:student_ids] = nil
+ stubs.get(get_assignment_overrides_url) do
+ [
+ 200,
+ {},
+ [ mock_override_nil_students, mock_override ].to_json
+ ]
+ end
+ expect(facade.send(
+ :get_existing_student_override,
+ course_id,
+ student_id,
+ assignment_id
+ ).student_ids[0]).to eq(student_id)
+ end
end
describe 'get_current_formatted_time' do
diff --git a/spec/facades/gradescope_facade_spec.rb b/spec/facades/gradescope_facade_spec.rb
index 6bdc0ca9..de8e09c2 100644
--- a/spec/facades/gradescope_facade_spec.rb
+++ b/spec/facades/gradescope_facade_spec.rb
@@ -338,7 +338,28 @@
facade.provision_extension(course_id, student_email, assignment_id, new_due_date)
end
- it 'posts extension with correct payload' do
+ it 'posts extension without hard_due_date when late due date is not provided' do
+ expected_payload = {
+ 'override' => {
+ 'user_id' => student_id,
+ 'settings' => {
+ 'due_date' => {
+ 'type' => 'absolute',
+ 'value' => new_due_date
+ }
+ },
+ 'visible' => true
+ }
+ }
+ expect(mock_client).to receive(:post).with(
+ "/courses/#{course_id}/assignments/#{assignment_id}/extensions",
+ expected_payload
+ )
+ facade.provision_extension(course_id, student_email, assignment_id, new_due_date)
+ end
+
+ it 'posts extension with hard_due_date when late due date is provided' do
+ late_due_date = '2026-01-05T23:59:59Z'
expected_payload = {
'override' => {
'user_id' => student_id,
@@ -349,7 +370,7 @@
},
'hard_due_date' => {
'type' => 'absolute',
- 'value' => new_due_date
+ 'value' => late_due_date
}
},
'visible' => true
@@ -359,7 +380,7 @@
"/courses/#{course_id}/assignments/#{assignment_id}/extensions",
expected_payload
)
- facade.provision_extension(course_id, student_email, assignment_id, new_due_date)
+ facade.provision_extension(course_id, student_email, assignment_id, new_due_date, late_due_date)
end
it 'verifies extension creation' do
diff --git a/spec/factories/course_settings.rb b/spec/factories/course_settings.rb
index 2204a106..2abddc97 100644
--- a/spec/factories/course_settings.rb
+++ b/spec/factories/course_settings.rb
@@ -12,6 +12,7 @@
# enable_extensions :boolean default(FALSE)
# enable_gradescope :boolean default(FALSE)
# enable_slack_webhook_url :boolean
+# extend_late_due_date :boolean default(TRUE), not null
# gradescope_course_url :string
# max_auto_approve :integer default(0)
# reply_email :string
diff --git a/spec/features/accessibility_spec.rb b/spec/features/accessibility_spec.rb
index 824f448b..106827b4 100644
--- a/spec/features/accessibility_spec.rb
+++ b/spec/features/accessibility_spec.rb
@@ -177,7 +177,7 @@ def wait_for_page_to_load
Capybara.reset_sessions!
rescue Selenium::WebDriver::Error::NoSuchWindowError, Selenium::WebDriver::Error::InvalidSessionIdError,
Selenium::WebDriver::Error::UnknownError
- puts 'Browser session problem. Ignore it and proceed.'
+
end
WebMock.disable_net_connect!(allow_localhost: true)
end
diff --git a/spec/models/course_settings_spec.rb b/spec/models/course_settings_spec.rb
index 9e078b3d..31cd24e8 100644
--- a/spec/models/course_settings_spec.rb
+++ b/spec/models/course_settings_spec.rb
@@ -1,3 +1,33 @@
+# == Schema Information
+#
+# Table name: course_settings
+#
+# id :bigint not null, primary key
+# auto_approve_days :integer default(0)
+# auto_approve_extended_request_days :integer default(0)
+# email_subject :string default("Extension Request Status: {{status}} - {{course_code}}")
+# email_template :text default("Dear {{student_name}},\n\nYour extension request for {{assignment_name}} in {{course_name}} ({{course_code}}) has been {{status}}.\n\nExtension Details:\n- Original Due Date: {{original_due_date}}\n- New Due Date: {{new_due_date}}\n- Extension Days: {{extension_days}}\n\nIf you have any questions, please contact the course staff.\n\nBest regards,\n{{course_name}} Staff")
+# enable_emails :boolean default(FALSE)
+# enable_extensions :boolean default(FALSE)
+# enable_gradescope :boolean default(FALSE)
+# enable_slack_webhook_url :boolean
+# extend_late_due_date :boolean default(TRUE), not null
+# gradescope_course_url :string
+# max_auto_approve :integer default(0)
+# reply_email :string
+# slack_webhook_url :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# course_id :bigint not null
+#
+# Indexes
+#
+# index_course_settings_on_course_id (course_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (course_id => courses.id)
+#
require 'rails_helper'
RSpec.describe CourseSettings, type: :model do
@@ -163,4 +193,38 @@
expect(course_settings.extract_gradescope_course_id(url)).to eq('456789')
end
end
+
+ describe 'extend_late_due_date setting' do
+ it 'defaults to true for new course settings' do
+ new_course = create(:course, canvas_id: 'canvas_new', course_name: 'New Course', course_code: 'NEW101')
+ new_settings = described_class.create!(course: new_course)
+ expect(new_settings.extend_late_due_date).to be true
+ end
+
+ it 'can be set to false' do
+ course_settings.extend_late_due_date = false
+ course_settings.save!
+ expect(course_settings.reload.extend_late_due_date).to be false
+ end
+
+ it 'can be toggled from true to false' do
+ course_settings.extend_late_due_date = true
+ course_settings.save!
+ expect(course_settings.extend_late_due_date).to be true
+
+ course_settings.extend_late_due_date = false
+ course_settings.save!
+ expect(course_settings.reload.extend_late_due_date).to be false
+ end
+
+ it 'can be toggled from false to true' do
+ course_settings.extend_late_due_date = false
+ course_settings.save!
+ expect(course_settings.extend_late_due_date).to be false
+
+ course_settings.extend_late_due_date = true
+ course_settings.save!
+ expect(course_settings.reload.extend_late_due_date).to be true
+ end
+ end
end
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index a7d91212..24bcb0eb 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -535,19 +535,46 @@
describe '#approve' do
let(:lms_facade) { CanvasFacade.new('fake_token') }
let(:provisioned_override) { instance_double(Lmss::Canvas::Override, id: 'override-1') }
+ let(:mock_date_calculator) { instance_double(AssignmentDateCalculator) }
before do
allow(lms_facade).to receive(:provision_extension).and_return(provisioned_override)
end
- it 'provisions an extension through the LMS facade' do
+ it 'provisions an extension through the LMS facade using AssignmentDateCalculator' do
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: nil
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
request.approve(lms_facade, instructor)
expect(lms_facade).to have_received(:provision_extension).with(
course.canvas_id,
user.canvas_uid.to_i,
assignment.external_assignment_id,
- request.requested_due_date.iso8601
+ request.requested_due_date.iso8601,
+ nil
+ )
+ end
+
+ it 'passes calculated late due date from AssignmentDateCalculator to the LMS facade' do
+ late_due_date = 5.days.from_now
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: late_due_date
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
+ request.approve(lms_facade, instructor)
+
+ expect(lms_facade).to have_received(:provision_extension).with(
+ course.canvas_id,
+ user.canvas_uid.to_i,
+ assignment.external_assignment_id,
+ request.requested_due_date.iso8601,
+ late_due_date.iso8601
)
end
@@ -595,17 +622,49 @@
end
it 'provisions an extension through Gradescope with email identifier' do
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: nil
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
+ request.approve(gradescope_facade, instructor)
+
+ expect(gradescope_facade).to have_received(:provision_extension).with(
+ course.gradescope_id,
+ user.email,
+ assignment.external_assignment_id,
+ request.requested_due_date.iso8601,
+ nil
+ )
+ end
+
+ it 'passes calculated late due date from AssignmentDateCalculator to Gradescope facade' do
+ late_due_date = 5.days.from_now
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: late_due_date
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
request.approve(gradescope_facade, instructor)
expect(gradescope_facade).to have_received(:provision_extension).with(
course.gradescope_id,
user.email,
assignment.external_assignment_id,
- request.requested_due_date.iso8601
+ request.requested_due_date.iso8601,
+ late_due_date.iso8601
)
end
it 'marks the request as approved and records Gradescope metadata' do
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: nil
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
expect(request.approve(gradescope_facade, instructor)).to be(true)
expect(request.status).to eq('approved')
@@ -615,6 +674,12 @@
it 'allows nil override but still approves for Gradescope' do
allow(gradescope_facade).to receive(:provision_extension).and_return(nil)
+ allow(mock_date_calculator).to receive(:calculate).and_return({
+ release_date: nil,
+ due_date: request.requested_due_date,
+ late_due_date: nil
+ })
+ allow(request).to receive(:date_calculator).and_return(mock_date_calculator)
expect(request.approve(gradescope_facade, instructor)).to be(true)
expect(request.external_extension_id).to be_nil
@@ -635,6 +700,172 @@
end
end
+ describe '#date_calculator' do
+ it 'returns an AssignmentDateCalculator instance' do
+ expect(request.date_calculator).to be_a(AssignmentDateCalculator)
+ end
+
+ it 'passes assignment, request, and course_settings to the calculator' do
+ course_settings
+ calculator = request.date_calculator
+ expect(calculator.assignment).to eq(request.assignment)
+ expect(calculator.request).to eq(request)
+ expect(calculator.course_settings).to eq(course.course_settings)
+ end
+
+ it 'memoizes the calculator instance' do
+ first_call = request.date_calculator
+ second_call = request.date_calculator
+ expect(first_call).to be(second_call)
+ end
+ end
+
+ describe '#calculate_new_late_due_date' do
+ it 'delegates to AssignmentDateCalculator#late_due_date' do
+ mock_calculator = instance_double(AssignmentDateCalculator)
+ expected_date = 5.days.from_now
+ allow(mock_calculator).to receive(:late_due_date).and_return(expected_date)
+ allow(request).to receive(:date_calculator).and_return(mock_calculator)
+
+ expect(request.calculate_new_late_due_date).to eq(expected_date)
+ end
+
+ # Integration tests to ensure the delegation works correctly
+ context 'integration with AssignmentDateCalculator' do
+ let(:original_due_date) { Time.zone.parse('2025-01-15 23:59:00') }
+ let(:original_late_due_date) { Time.zone.parse('2025-01-17 23:59:00') }
+ let(:requested_due_date) { Time.zone.parse('2025-01-18 23:59:00') }
+
+ let(:assignment_with_late_due_date) do
+ Assignment.create!(
+ name: 'Assignment with Late Due Date',
+ course_to_lms_id: course.course_to_lms(1).id,
+ external_assignment_id: 'ext2',
+ enabled: true,
+ due_date: original_due_date,
+ late_due_date: original_late_due_date
+ )
+ end
+
+ let(:assignment_without_late_due_date) do
+ Assignment.create!(
+ name: 'Assignment without Late Due Date',
+ course_to_lms_id: course.course_to_lms(1).id,
+ external_assignment_id: 'ext3',
+ enabled: true,
+ due_date: original_due_date,
+ late_due_date: nil
+ )
+ end
+
+ let(:request_with_late_due_date) do
+ described_class.create!(
+ user: user,
+ course: course,
+ assignment: assignment_with_late_due_date,
+ reason: 'Need more time',
+ requested_due_date: requested_due_date
+ )
+ end
+
+ let(:request_without_late_due_date) do
+ described_class.create!(
+ user: user,
+ course: course,
+ assignment: assignment_without_late_due_date,
+ reason: 'Need more time',
+ requested_due_date: requested_due_date
+ )
+ end
+
+ context 'when assignment has no late due date' do
+ it 'returns nil' do
+ expect(request_without_late_due_date.calculate_new_late_due_date).to be_nil
+ end
+ end
+
+ context 'when extend_late_due_date setting is true (default)' do
+ before do
+ CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: true
+ )
+ end
+
+ it 'shifts the late due date by the same delta as the extension' do
+ # Original due date: Jan 15, Late due date: Jan 17 (2 days later)
+ # Extension delta: Jan 18 - Jan 15 = 3 days
+ # New late due date: Jan 17 + 3 days = Jan 20
+ result = request_with_late_due_date.calculate_new_late_due_date
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(result).to be_within(1.second).of(expected)
+ end
+ end
+
+ context 'when extend_late_due_date setting is false' do
+ before do
+ CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: false
+ )
+ end
+
+ context 'when original late due date is later than extended due date' do
+ let(:requested_due_date) { Time.zone.parse('2025-01-16 23:59:00') }
+
+ it 'returns the original late due date' do
+ # Extended due date (Jan 16) is before late due date (Jan 17)
+ # So return the original late due date
+ result = request_with_late_due_date.calculate_new_late_due_date
+ expect(result).to eq(original_late_due_date)
+ end
+ end
+
+ context 'when extended due date is later than original late due date' do
+ let(:requested_due_date) { Time.zone.parse('2025-01-20 23:59:00') }
+
+ it 'returns the extended due date' do
+ # Extended due date (Jan 20) is after late due date (Jan 17)
+ # So return the extended due date
+ result = request_with_late_due_date.calculate_new_late_due_date
+ expect(result).to eq(requested_due_date)
+ end
+ end
+ end
+
+ context 'when extend_late_due_date setting is nil (defaults to true)' do
+ before do
+ # Create settings without explicitly setting extend_late_due_date
+ # This simulates existing courses before the migration
+ cs = CourseSettings.create!(
+ course: course,
+ enable_extensions: true
+ )
+ # Manually set to nil to simulate pre-migration state
+ # cs.update_column(:extend_late_due_date, nil)
+ cs.extend_late_due_date = nil
+ end
+
+ it 'defaults to shifting the late due date by the extension delta' do
+ result = request_with_late_due_date.calculate_new_late_due_date
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(result).to be_within(1.second).of(expected)
+ end
+ end
+
+ context 'when course has no course settings' do
+ it 'defaults to shifting the late due date (extend_late_due_date = true behavior)' do
+ # No course settings means nil, which defaults to true
+ result = request_with_late_due_date.calculate_new_late_due_date
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(result).to be_within(1.second).of(expected)
+ end
+ end
+ end
+ end
+
describe '#send_email_response' do
before do
ENV['DEFAULT_FROM_EMAIL'] = 'flextensions@berkeley.edu'
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0b8c754a..2749c91b 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -66,7 +66,6 @@
config.before(:suite) do
Rails.application.load_seed
- puts "Loaded seeds"
end
# If you're not using ActiveRecord, or you'd prefer not to run each of your
diff --git a/spec/services/assignment_date_calculator_spec.rb b/spec/services/assignment_date_calculator_spec.rb
new file mode 100644
index 00000000..558f8796
--- /dev/null
+++ b/spec/services/assignment_date_calculator_spec.rb
@@ -0,0 +1,252 @@
+# spec/services/assignment_date_calculator_spec.rb
+require 'rails_helper'
+
+RSpec.describe AssignmentDateCalculator, type: :service do
+ let(:user) { create(:user, email: 'student@example.com', name: 'Student') }
+ let(:course) { create(:course, :with_students, :with_staff, course_name: 'Test Course', canvas_id: '789') }
+
+ let(:original_due_date) { Time.zone.parse('2025-01-15 23:59:00') }
+ let(:original_late_due_date) { Time.zone.parse('2025-01-17 23:59:00') }
+ let(:requested_due_date) { Time.zone.parse('2025-01-18 23:59:00') }
+
+ let(:assignment_with_late_due_date) do
+ Assignment.create!(
+ name: 'Assignment with Late Due Date',
+ course_to_lms_id: course.course_to_lms(1).id,
+ external_assignment_id: 'ext1',
+ enabled: true,
+ due_date: original_due_date,
+ late_due_date: original_late_due_date
+ )
+ end
+
+ let(:assignment_without_late_due_date) do
+ Assignment.create!(
+ name: 'Assignment without Late Due Date',
+ course_to_lms_id: course.course_to_lms(1).id,
+ external_assignment_id: 'ext2',
+ enabled: true,
+ due_date: original_due_date,
+ late_due_date: nil
+ )
+ end
+
+ let(:request_with_late_due_date) do
+ Request.create!(
+ user: user,
+ course: course,
+ assignment: assignment_with_late_due_date,
+ reason: 'Need more time',
+ requested_due_date: requested_due_date
+ )
+ end
+
+ let(:request_without_late_due_date) do
+ Request.create!(
+ user: user,
+ course: course,
+ assignment: assignment_without_late_due_date,
+ reason: 'Need more time',
+ requested_due_date: requested_due_date
+ )
+ end
+
+ before do
+ UserToCourse.create!(user: user, course: course, role: 'student')
+ end
+
+ describe '#calculate' do
+ it 'returns a hash with release_date, due_date, and late_due_date' do
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: nil
+ )
+
+ result = calculator.calculate
+
+ expect(result).to be_a(Hash)
+ expect(result).to have_key(:release_date)
+ expect(result).to have_key(:due_date)
+ expect(result).to have_key(:late_due_date)
+ end
+ end
+
+ describe '#release_date' do
+ it 'always returns nil' do
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: nil
+ )
+
+ expect(calculator.release_date).to be_nil
+ end
+ end
+
+ describe '#due_date' do
+ it 'returns the requested due date from the request' do
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: nil
+ )
+
+ expect(calculator.due_date).to eq(requested_due_date)
+ end
+ end
+
+ describe '#late_due_date' do
+ context 'when assignment has no late due date' do
+ it 'returns nil regardless of course settings' do
+ course_settings = CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: true
+ )
+
+ calculator = described_class.new(
+ assignment: assignment_without_late_due_date,
+ request: request_without_late_due_date,
+ course_settings: course_settings
+ )
+
+ expect(calculator.late_due_date).to be_nil
+ end
+
+ it 'returns nil when extend_late_due_date is false' do
+ course_settings = CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: false
+ )
+
+ calculator = described_class.new(
+ assignment: assignment_without_late_due_date,
+ request: request_without_late_due_date,
+ course_settings: course_settings
+ )
+
+ expect(calculator.late_due_date).to be_nil
+ end
+ end
+
+ context 'when assignment has a late due date' do
+ context 'when extend_late_due_date setting is true (default)' do
+ let(:course_settings) do
+ CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: true
+ )
+ end
+
+ it 'shifts the late due date by the same delta as the extension' do
+ # Original due date: Jan 15, Late due date: Jan 17 (2 days later)
+ # Extension delta: Jan 18 - Jan 15 = 3 days
+ # New late due date: Jan 17 + 3 days = Jan 20
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: course_settings
+ )
+
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(calculator.late_due_date).to be_within(1.second).of(expected)
+ end
+ end
+
+ context 'when extend_late_due_date setting is false' do
+ let(:course_settings) do
+ CourseSettings.create!(
+ course: course,
+ enable_extensions: true,
+ extend_late_due_date: false
+ )
+ end
+
+ context 'when original late due date is later than extended due date' do
+ let(:short_extension_request) do
+ Request.create!(
+ user: user,
+ course: course,
+ assignment: assignment_with_late_due_date,
+ reason: 'Need a bit more time',
+ requested_due_date: Time.zone.parse('2025-01-16 23:59:00')
+ )
+ end
+
+ it 'returns the original late due date' do
+ # Extended due date (Jan 16) is before late due date (Jan 17)
+ # So return the original late due date
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: short_extension_request,
+ course_settings: course_settings
+ )
+
+ expect(calculator.late_due_date).to eq(original_late_due_date)
+ end
+ end
+
+ context 'when extended due date is later than original late due date' do
+ let(:long_extension_request) do
+ Request.create!(
+ user: user,
+ course: course,
+ assignment: assignment_with_late_due_date,
+ reason: 'Need much more time',
+ requested_due_date: Time.zone.parse('2025-01-20 23:59:00')
+ )
+ end
+
+ it 'returns the extended due date' do
+ # Extended due date (Jan 20) is after late due date (Jan 17)
+ # So return the extended due date
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: long_extension_request,
+ course_settings: course_settings
+ )
+
+ expect(calculator.late_due_date).to eq(Time.zone.parse('2025-01-20 23:59:00'))
+ end
+ end
+ end
+
+ context 'when extend_late_due_date setting is nil (defaults to true)' do
+ it 'defaults to shifting the late due date by the extension delta' do
+ # Create settings without explicitly setting extend_late_due_date
+ cs = CourseSettings.create!(
+ course: course,
+ enable_extensions: true
+ )
+ # Manually set to nil to simulate pre-migration state
+ # Don't persist the nil value since the column doesn't allow it, but we want to test the behavior of the method when it encounters a nil value
+ cs.extend_late_due_date = nil
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: cs
+ )
+
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(calculator.late_due_date).to be_within(1.second).of(expected)
+ end
+ end
+
+ context 'when course_settings is nil' do
+ it 'defaults to shifting the late due date (extend_late_due_date = true behavior)' do
+ calculator = described_class.new(
+ assignment: assignment_with_late_due_date,
+ request: request_with_late_due_date,
+ course_settings: nil
+ )
+
+ expected = Time.zone.parse('2025-01-20 23:59:00')
+ expect(calculator.late_due_date).to be_within(1.second).of(expected)
+ end
+ end
+ end
+ end
+end