diff --git a/app/assets/javascripts/components/common/ArticleViewer/utils/ArticleScroll.js b/app/assets/javascripts/components/common/ArticleViewer/utils/ArticleScroll.js
index 325b4ba36f..05f3a3f630 100644
--- a/app/assets/javascripts/components/common/ArticleViewer/utils/ArticleScroll.js
+++ b/app/assets/javascripts/components/common/ArticleViewer/utils/ArticleScroll.js
@@ -40,9 +40,9 @@ export class ArticleScroll {
// Scrolling Logic, Scrolls to paragraph that contains revision by user
scrollTo(name, scrollBox) {
this.bump = false;
- const paragraphs = this.scrollObject[name].filteredParagraphs;
+ const paragraphs = this.scrollObject[name]?.filteredParagraphs || [];
const length = paragraphs.length;
- this.nextPosition = paragraphs[this.scrollObject[name].index].coordinates;
+ this.nextPosition = paragraphs[this.scrollObject[name]?.index]?.coordinates ?? null;
// Finds closest edit if user switchs to a different editor
if (name !== this.currentName && this.currentName !== null) {
diff --git a/app/assets/javascripts/components/common/calendar.jsx b/app/assets/javascripts/components/common/calendar.jsx
index 32aaae8baf..2c3606094d 100644
--- a/app/assets/javascripts/components/common/calendar.jsx
+++ b/app/assets/javascripts/components/common/calendar.jsx
@@ -64,9 +64,7 @@ const Calendar = createReactClass({
}
}
- course.day_exceptions = exceptions.join(',');
- course.no_day_exceptions = (compact(exceptions).length === 0);
- return this.props.updateCourse(course);
+ return this.props.updateCourse({ ...course, day_exceptions: exceptions.join(','), no_day_exceptions: (compact(exceptions).length === 0) });
},
selectWeekday(e, weekday) {
let weekdays;
diff --git a/app/assets/javascripts/components/common/list.jsx b/app/assets/javascripts/components/common/list.jsx
index 565c5b072a..7b034dab17 100644
--- a/app/assets/javascripts/components/common/list.jsx
+++ b/app/assets/javascripts/components/common/list.jsx
@@ -22,9 +22,11 @@ const List = ({
const persistAreaElement = persistAreaElements[i];
if (fixHeader) {
const floatingHeaderRow = persistAreaElements[i].getElementsByClassName('floatingHeader')[0];
- const style = window.getComputedStyle(persistAreaElement);
- const width = style.getPropertyValue('width');
- floatingHeaderRow.style.width = width;
+ if (floatingHeaderRow) {
+ const style = window.getComputedStyle(persistAreaElement);
+ const width = style.getPropertyValue('width');
+ floatingHeaderRow.style.width = width;
+ }
}
const offset = persistAreaElement.offsetTop;
const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
diff --git a/app/assets/javascripts/components/course_creator/course_form.jsx b/app/assets/javascripts/components/course_creator/course_form.jsx
index c7230ec749..4fba63d553 100644
--- a/app/assets/javascripts/components/course_creator/course_form.jsx
+++ b/app/assets/javascripts/components/course_creator/course_form.jsx
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
import { Link } from 'react-router-dom';
import TextAreaInput from '../common/text_area_input.jsx';
import CreatableInput from '../common/creatable_input.jsx';
@@ -12,6 +13,7 @@ import selectStyles from '../../styles/select';
import WikiSelect from '../common/wiki_select.jsx';
import AcademicSystem from '../common/academic_system.jsx';
import WIKI_OPTIONS from '../../utils/wiki_options';
+import { updateCourse } from '@actions/course_actions.js';
const CourseForm = (props) => {
const handleWikiChange = (wiki) => {
@@ -31,6 +33,15 @@ const CourseForm = (props) => {
props.updateCourseProps({ wikis });
};
+ const dispatch = useDispatch();
+
+ useEffect(() => {
+ if (props.course.wikis && !props.course.wikis.length) {
+ dispatch(updateCourse({ wikis: [{ language: 'en', project: 'wikipedia' }] }));
+ }
+ }, []);
+
+
let term;
let courseSubject;
let expectedStudents;
@@ -133,17 +144,11 @@ const CourseForm = (props) => {
);
}
-
-
let privacyCheckbox;
let campaign;
let home_wiki;
let multi_wiki;
- if (props.course.wikis && !props.course.wikis.length) {
- props.course.wikis.push({ language: 'en', project: 'wikipedia' });
- }
-
if (props.defaultCourse !== 'ClassroomProgramCourse') {
home_wiki = (
@@ -181,6 +186,7 @@ const CourseForm = (props) => {
/>
);
}
+
if (props.course.initial_campaign_title) {
campaign = (
{
/>
);
}
+
let backCondition;
+
if (Features.wikiEd) {
backCondition = props.previousWikiEd;
} else {
@@ -198,15 +206,15 @@ const CourseForm = (props) => {
let backOrCancelButton;
-// Displays "Back" button if the user has clonable courses or is on the P&E dashboard; otherwise shows "Cancel" link.
-if (props.hasClonableCourses || props.defaultCourse !== 'ClassroomProgramCourse') {
- backOrCancelButton = (
-
- );
- } else {
- backOrCancelButton = (
- {I18n.t('application.cancel')}
- );
+ // Displays "Back" button if the user has clonable courses or is on the P&E dashboard; otherwise shows "Cancel" link.
+ if (props.hasClonableCourses || props.defaultCourse !== 'ClassroomProgramCourse') {
+ backOrCancelButton = (
+
+ );
+ } else {
+ backOrCancelButton = (
+ {I18n.t('application.cancel')}
+ );
}
return (
diff --git a/app/assets/javascripts/components/high_order/conditional.jsx b/app/assets/javascripts/components/high_order/conditional.jsx
index dd587cbda6..4a17967d9e 100644
--- a/app/assets/javascripts/components/high_order/conditional.jsx
+++ b/app/assets/javascripts/components/high_order/conditional.jsx
@@ -1,25 +1,24 @@
import React from 'react';
-import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
// Enables DRY and simple conditional components
// Renders items when 'show' prop is undefined
const Conditional = function (Component) {
- return createReactClass({
- displayName: `Conditional${Component.displayName}`,
+ const ConditionalComponent = (props) => {
+ if (props.show === undefined || props.show) {
+ return (
-
-
-
-
-
-
-
-
+ return (
+
+
+
+
+
+
+
+
+
+
+ );
+};
-
- );
- },
-});
+AdminUser.propTypes = {
+ downgradeAdmin: PropTypes.func,
+ revokingAdmin: PropTypes.shape({
+ status: PropTypes.bool,
+ username: PropTypes.string
+ }),
+ user: PropTypes.shape({
+ id: PropTypes.number,
+ username: PropTypes.string.isRequired,
+ real_name: PropTypes.string,
+ permissions: PropTypes.number.isRequired,
+ }),
+};
export default AdminUser;
diff --git a/app/assets/javascripts/components/students/components/Articles/SelectedStudent/RevisionsList/StudentRevisionRow.jsx b/app/assets/javascripts/components/students/components/Articles/SelectedStudent/RevisionsList/StudentRevisionRow.jsx
index a042a8dda2..fcf0670ba2 100644
--- a/app/assets/javascripts/components/students/components/Articles/SelectedStudent/RevisionsList/StudentRevisionRow.jsx
+++ b/app/assets/javascripts/components/students/components/Articles/SelectedStudent/RevisionsList/StudentRevisionRow.jsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
// Components
import ContentAdded from '@components/students/shared/StudentList/Student/ContentAdded.jsx';
+import { setUploadFilters } from '~/app/assets/javascripts/actions/uploads_actions';
export const StudentRevisionRow = ({ course, isOpen, toggleDrawer, student, uploadsLink }) => {
return (
@@ -18,7 +19,7 @@ export const StudentRevisionRow = ({ course, isOpen, toggleDrawer, student, uplo
{ this.setUploadFilters([{ value: student.username, label: student.username }]); }}
+ onClick={() => { setUploadFilters([{ value: student.username, label: student.username }]); }}
>
{student.total_uploads || 0}
diff --git a/app/assets/javascripts/components/timeline/BlockList.jsx b/app/assets/javascripts/components/timeline/BlockList.jsx
index 0eb3e2bf02..db0cda418c 100644
--- a/app/assets/javascripts/components/timeline/BlockList.jsx
+++ b/app/assets/javascripts/components/timeline/BlockList.jsx
@@ -5,8 +5,8 @@ import { Flipper } from 'react-flip-toolkit';
const BlockList = ({ blocks, moveBlock, week_id, ...props }) => {
const springBlocks = blocks.map((block, i) => {
- block.order = i;
- return block.id).join('')} spring="stiff">
diff --git a/app/assets/javascripts/components/timeline/meetings.jsx b/app/assets/javascripts/components/timeline/meetings.jsx
index eb06704422..a945baee8b 100644
--- a/app/assets/javascripts/components/timeline/meetings.jsx
+++ b/app/assets/javascripts/components/timeline/meetings.jsx
@@ -1,6 +1,5 @@
-import React from 'react';
+import React, { useRef } from 'react';
import { connect } from 'react-redux';
-import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
import CourseLink from '../common/course_link.jsx';
import Calendar from '../common/calendar.jsx';
@@ -10,151 +9,145 @@ import CourseDateUtils from '../../utils/course_date_utils.js';
import { updateCourse, persistCourse } from '../../actions/course_actions';
import { isValid } from '../../selectors';
-const Meetings = createReactClass({
- displayName: 'Meetings',
+const Meetings = (props) => {
+ const noDatesRef = useRef();
- propTypes: {
- weeks: PropTypes.array, // Comes indirectly from TimelineHandler
- course: PropTypes.object,
- updateCourse: PropTypes.func.isRequired,
- persistCourse: PropTypes.func.isRequired,
- isValid: PropTypes.bool.isRequired
- },
-
- disableSave(bool) {
- return this.setState({ saveDisabled: bool });
- },
-
- updateCourse(valueKey, value) {
- const toPass = this.props.course;
+ const updateCourseHandler = (valueKey, value) => {
+ const toPass = props.course;
toPass[valueKey] = value;
- return this.props.updateCourse(toPass);
- },
+ return props.updateCourse(toPass);
+ };
- updateCourseDates(valueKey, value) {
- const updatedCourse = CourseDateUtils.updateCourseDates(this.props.course, valueKey, value);
- return this.props.updateCourse(updatedCourse);
- },
+ const updateCourseDates = (valueKey, value) => {
+ const updatedCourse = CourseDateUtils.updateCourseDates(props.course, valueKey, value);
+ return props.updateCourse(updatedCourse);
+ };
- saveCourse(e) {
- if (this.props.isValid) {
- return this.props.persistCourse(this.props.course.slug);
+ const saveCourse = (e) => {
+ if (props.isValid) {
+ return props.persistCourse(props.course.slug);
}
e.preventDefault();
return alert(I18n.t('error.form_errors'));
- },
+ };
- updateCheckbox(e) {
- this.updateCourse('no_day_exceptions', e.target.checked);
- return this.updateCourse('day_exceptions', '');
- },
+ const updateCheckbox = (e) => {
+ updateCourseHandler('no_day_exceptions', e.target.checked);
+ return updateCourseHandler('day_exceptions', '');
+ };
- saveDisabledClass(course) {
+ const saveDisabledClass = (course) => {
const blackoutDatesSelected = course.day_exceptions && course.day_exceptions.length > 0;
const anyDatesSelected = course.weekdays && course.weekdays.indexOf(1) >= 0;
- const enable = blackoutDatesSelected || (anyDatesSelected && this.props.course.no_day_exceptions);
+ const enable = blackoutDatesSelected || (anyDatesSelected && props.course.no_day_exceptions);
if (enable) { return ''; }
return 'disabled';
- },
+ };
- render() {
- const course = this.props.course;
- if (!course) { return ; }
- const dateProps = CourseDateUtils.dateProps(course);
- let courseLinkClass = 'dark button ';
- courseLinkClass += this.saveDisabledClass(course);
- const courseLinkTarget = `/courses/${course.slug}/timeline`;
+ const { course } = props;
+ if (!course) { return ; }
- return (
-
-
-
-
+
+
);
- } else if (this.props.editable === undefined || this.props.editable) {
+ } else if (props.editable === undefined || props.editable) {
return (
-
+
);
}
- },
+ }, [props.editPermissions, editable, props.editable, cancelChanges, saveChanges, toggleEditable]);
- render() {
- return {user.username}
-{user.real_name}
-{adminLevel}
-- -
+ let buttonText; + let buttonClass = 'button'; + switch (getButtonState()) { + case 'confirming': + buttonClass += ' danger'; + buttonText = I18n.t('settings.admin_users.remove.revoke_button_confirm', { username: user.username }); + break; + case 'revoking': + buttonText = I18n.t('settings.admin_users.remove.revoking_button_working'); + buttonClass += ' border'; + break; + default: + // not confirming + buttonClass += ' danger'; + buttonText = I18n.t('settings.admin_users.remove.revoke_button'); + break; + } -{user.username}
+{user.real_name}
+{adminLevel}
++ +
+
-
-
{I18n.t('timeline.course_dates')}
-
-
- {I18n.t('timeline.course_dates_instructions')}
-
-
- -
-
+
{I18n.t('timeline.assignment_dates_instructions')}
-
-
+ const dateProps = CourseDateUtils.dateProps(course);
+ let courseLinkClass = 'dark button ';
+ courseLinkClass += saveDisabledClass(course);
+ const courseLinkTarget = `/courses/${course.slug}/timeline`;
+
+ return (
+
+
{I18n.t('timeline.course_dates')}
+
+
-
{I18n.t('timeline.course_dates_instructions')}
+
+
- -
-
+
+
+
+
+
+
+ );
+};
+
+Meetings.propTypes = {
+ weeks: PropTypes.array, // Comes indirectly from TimelineHandler
+ course: PropTypes.object,
+ updateCourse: PropTypes.func.isRequired,
+ persistCourse: PropTypes.func.isRequired,
+ isValid: PropTypes.bool.isRequired
+};
const mapStateToProps = state => ({
isValid: isValid(state)
diff --git a/app/assets/javascripts/components/timeline/timeline_handler.jsx b/app/assets/javascripts/components/timeline/timeline_handler.jsx
index a497f20a82..bb0a6e6fc0 100644
--- a/app/assets/javascripts/components/timeline/timeline_handler.jsx
+++ b/app/assets/javascripts/components/timeline/timeline_handler.jsx
@@ -1,5 +1,5 @@
// Import necessary hooks (useState, useEffect) and useNavigate from react-router-dom
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import TransitionGroup from '../common/css_transition_group';
@@ -25,12 +25,21 @@ const TimelineHandler = (props) => {
const [reorderable, setReorderable] = useState(false);
const [editableTitles, setEditableTitles] = useState(false);
-// Replace componentDidMount with useEffect hook
+ const resetWeekTitles = useRef(false);
+
+ // Replace componentDidMount with useEffect hook
useEffect(() => {
document.title = `${props.course.title} - ${I18n.t('courses.timeline_link')}`;
props.fetchAllTrainingModules();
}, [props.course.title, props.fetchAllTrainingModules]);
+ useEffect(() => {
+ if (resetWeekTitles.current) {
+ saveTimeline();
+ resetWeekTitles.current = false;
+ }
+ }, [props.weeks]);
+
// Convert class methods to regular functions within the component
const _cancelBlockEditable = (blockId) => {
// TODO: Restore to persisted state for this block only
@@ -54,7 +63,7 @@ const TimelineHandler = (props) => {
const _resetTitles = () => {
if (confirm(I18n.t('timeline.reset_titles_confirmation'))) {
props.resetTitles();
- saveTimeline();
+ resetWeekTitles.current = true;
}
};
diff --git a/app/assets/javascripts/components/util/create_store.js b/app/assets/javascripts/components/util/create_store.js
index 98bbd57184..95a5fbb3a2 100644
--- a/app/assets/javascripts/components/util/create_store.js
+++ b/app/assets/javascripts/components/util/create_store.js
@@ -29,8 +29,8 @@ export const getStore = () => {
};
}
- // Determine if mutation checks should be enabled
- const enableMutationChecks = false;
+ // Determine if Redux Toolkit's safety checks should be enabled
+ const enableReduxSafetyChecks = false;
const store = configureStore({
reducer,
@@ -39,9 +39,9 @@ export const getStore = () => {
getDefaultMiddleware({
// Temporarily disable mutation checks feature to facilitate Redux Toolkit migration.
// TODO: Gradually resolve state mutations and re-enable these checks in the future.
- // Enable mutation checks when resolving or detecting these issues by setting enableMutationChecks to true.
- immutableCheck: enableMutationChecks,
- serializableCheck: enableMutationChecks,
+ // Enable mutation checks when resolving or detecting these issues by setting enableReduxSafetyChecks to true.
+ immutableCheck: enableReduxSafetyChecks,
+ serializableCheck: enableReduxSafetyChecks,
}),
});
diff --git a/app/assets/javascripts/components/wizard/form_panel.jsx b/app/assets/javascripts/components/wizard/form_panel.jsx
index 142e2d92bd..71d0be8d60 100644
--- a/app/assets/javascripts/components/wizard/form_panel.jsx
+++ b/app/assets/javascripts/components/wizard/form_panel.jsx
@@ -1,144 +1,138 @@
-import React from 'react';
-import createReactClass from 'create-react-class';
+import React, { useRef } from 'react';
import PropTypes from 'prop-types';
import Panel from './panel.jsx';
import DatePicker from '../common/date_picker.jsx';
import Calendar from '../common/calendar.jsx';
import CourseDateUtils from '../../utils/course_date_utils.js';
-const FormPanel = createReactClass({
- displayName: 'FormPanel',
+const FormPanel = (props) => {
+ const noDates = useRef();
- propTypes: {
- course: PropTypes.object.isRequired,
- shouldShowSteps: PropTypes.bool,
- updateCourse: PropTypes.func.isRequired,
- isValid: PropTypes.bool.isRequired
- },
-
- setAnyDatesSelected(bool) {
- return this.setState({ anyDatesSelected: bool });
- },
-
- setBlackoutDatesSelected(bool) {
- return this.setState({ blackoutDatesSelected: bool });
- },
- setNoBlackoutDatesChecked() {
- const { checked } = this.noDates;
- const toPass = this.props.course;
+ const setNoBlackoutDatesChecked = () => {
+ const { checked } = noDates.current;
+ const toPass = props.course;
toPass.no_day_exceptions = checked;
- return this.props.updateCourse(toPass);
- },
+ return props.updateCourse(toPass);
+ };
- updateCourseDates(valueKey, value) {
- const updatedCourse = CourseDateUtils.updateCourseDates(this.props.course, valueKey, value);
- return this.props.updateCourse(updatedCourse);
- },
+ const updateCourseDates = (valueKey, value) => {
+ const updatedCourse = CourseDateUtils.updateCourseDates(props.course, valueKey, value);
+ return props.updateCourse(updatedCourse);
+ };
- saveCourse() {
- if (this.props.isValid) {
- this.props.persistCourse(this.props.course.slug);
+ const saveCourse = () => {
+ if (props.isValid) {
+ props.persistCourse(props.course.slug);
return true;
}
alert(I18n.t('error.form_errors'));
return false;
- },
- nextEnabled() {
- if (__guard__(this.props.course.weekdays, x => x.indexOf(1)) >= 0 && (__guard__(this.props.course.day_exceptions, x1 => x1.length) > 0 || this.props.course.no_day_exceptions)) {
+ };
+
+ const nextEnabled = () => {
+ if (__guard__(props.course.weekdays, x => x.indexOf(1)) >= 0
+ && (__guard__(props.course.day_exceptions, x1 => x1.length) > 0 || props.course.no_day_exceptions)) {
return true;
}
return false;
- },
+ };
- render() {
- const dateProps = CourseDateUtils.dateProps(this.props.course);
+ const dateProps = CourseDateUtils.dateProps(props.course);
- const step1 = this.props.shouldShowSteps
- ? {I18n.t('timeline.assignment_dates_instructions')}
+
+
-
-
-
+
-
- Done
-
-
+ +
+
+
+
+
-
- );
- }
-}
-);
+
+
+ {I18n.t('timeline.done')}
+
1. Confirm the course’s start and end dates.
- :Confirm the course’s start and end dates.
; + const step1 = props.shouldShowSteps + ?1. {I18n.t('wizard.confirm_course_dates')}
+ :{I18n.t('wizard.confirm_course_dates')}
; - const rawOptions = ( -
-
-
- {step1}
-
-
-
- -
-
{I18n.t('wizard.assignment_description')}
-
-
+ const rawOptions = (
+
+
+ {step1}
+
-
" << + PandocRuby.convert(slide.content, from: :markdown_github, to: :html) << + "
" + end + + output = '' + +TrainingModule.all.each do |tm| + output += "---
---" + output += "\n
" + tm.slides.each do |slide| + output += html_from_slide(slide) + end +end + +File.open('training_content.html', 'wb') { |file| file.write(output) } + +# The pandoc conversion fails if a local asset file from the html does not exist. +# As of January 2025, the only case of this is the inline icon in slide 334-authorship-highlighting.yml +# Edit the html file to turn it into an absolute path — https://dashboard.wikiedu.org/assets/images/article-viewer.svg +# then proceed with the conversion. + +`pandoc training_content.html --to docx --output trainings.docx` \ No newline at end of file diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 05b3201769..e333688461 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -43,7 +43,7 @@ Your system has cmdtest installed, which provides a different program as yarn. U - **To check if redis is running as a daemon in Linux** `ps aux | grep redis-server` -- Use node v10 or lower to avoid any errors. +- Use node v14 or newer to avoid any errors. - **For WSL users , if rspec tests are taking too long to run** make sure to fork the repo in the linux file system and not in the windows partition. Use command `pwd` to know the exact path of your repo. If the path starts with `/mnt/`, the repo is in windows partition. Follow the documentation available at link: https://learn.microsoft.com/en-us/windows/wsl/filesystems to know more about storing and moving files in the linux file system. If you have received error related to dependencies(`sudo apt-get install -y redis-server mariadb-server libmariadb-dev rvm nodejs npm pandoc`), try to install packages one by one and figure out which packages are creating problems. diff --git a/fixtures/vcr_cassettes/cached/assigned_articles_view.yml b/fixtures/vcr_cassettes/cached/assigned_articles_view.yml new file mode 100644 index 0000000000..c869051cfa --- /dev/null +++ b/fixtures/vcr_cassettes/cached/assigned_articles_view.yml @@ -0,0 +1,133 @@ +--- +http_interactions: +- request: + method: get + uri: https://en.wikipedia.org/w/api.php?action=query&format=json&prop=revisions&rvprop=ids&titles=Nancy%20Tuana + body: + encoding: US-ASCII + string: '' + headers: + User-Agent: + - Faraday v1.10.2 + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + Accept: + - "*/*" + response: + status: + code: 200 + message: OK + headers: + Date: + - Tue, 28 Jan 2025 18:55:00 GMT + Server: + - mw-api-ext.eqiad.main-5f7d7bfc55-psxcn + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - DENY + Content-Disposition: + - inline; filename=api-result.json + Vary: + - Accept-Encoding,Treat-as-Untrusted,X-Forwarded-Proto,Cookie,Authorization + Cache-Control: + - private, must-revalidate, max-age=0 + Content-Type: + - application/json; charset=utf-8 + Age: + - '0' + X-Cache: + - cp6014 miss, cp6011 pass + X-Cache-Status: + - pass + Server-Timing: + - cache;desc="pass", host;desc="cp6011" + Strict-Transport-Security: + - max-age=106384710; includeSubDomains; preload + Report-To: + - '{ "group": "wm_nel", "max_age": 604800, "endpoints": [{ "url": "https://intake-logging.wikimedia.org/v1/events?stream=w3c.reportingapi.network_error&schema_uri=/w3c/reportingapi/network_error/1.0.0" + }] }' + Nel: + - '{ "report_to": "wm_nel", "max_age": 604800, "failure_fraction": 0.05, "success_fraction": + 0.0}' + Set-Cookie: + - GeoIP=CM:::6.00:12.50:v4; Path=/; secure; Domain=.wikipedia.org + - NetworkProbeLimit=0.001;Path=/;Secure;SameSite=Lax;Max-Age=3600 + - WMF-Last-Access-Global=28-Jan-2025;Path=/;Domain=.wikipedia.org;HttpOnly;secure;Expires=Sat, + 01 Mar 2025 12:00:00 GMT + - WMF-Last-Access=28-Jan-2025;Path=/;HttpOnly;secure;Expires=Sat, 01 Mar 2025 + 12:00:00 GMT + X-Client-Ip: + - 102.244.157.204 + Accept-Ranges: + - bytes + Content-Length: + - '144' + body: + encoding: ASCII-8BIT + string: '{"batchcomplete":"","query":{"pages":{"51910526":{"pageid":51910526,"ns":0,"title":"Nancy + Tuana","revisions":[{"revid":1220423548,"parentid":1180607625}]}}}}' + recorded_at: Tue, 28 Jan 2025 18:55:00 GMT +- request: + method: post + uri: https://api.wikimedia.org/service/lw/inference/v1/models/enwiki-articlequality:predict + body: + encoding: UTF-8 + string: '{"rev_id":1220423548,"extended_output":true}' + headers: + Content-Type: + - application/json + User-Agent: + - Faraday v1.10.2 + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + Accept: + - "*/*" + response: + status: + code: 200 + message: OK + headers: + Content-Type: + - application/json + Date: + - Tue, 28 Jan 2025 18:55:00 GMT + Server: + - envoy + Cache-Control: + - no-cache + X-Ratelimit-Limit: + - 50000, 50000;w=3600 + X-Ratelimit-Remaining: + - '49994' + X-Ratelimit-Reset: + - '299' + Vary: + - Accept-Encoding + Age: + - '1' + X-Cache: + - cp6014 miss, cp6011 pass + X-Cache-Status: + - pass + Server-Timing: + - cache;desc="pass", host;desc="cp6011" + Strict-Transport-Security: + - max-age=106384710; includeSubDomains; preload + Report-To: + - '{ "group": "wm_nel", "max_age": 604800, "endpoints": [{ "url": "https://intake-logging.wikimedia.org/v1/events?stream=w3c.reportingapi.network_error&schema_uri=/w3c/reportingapi/network_error/1.0.0" + }] }' + Nel: + - '{ "report_to": "wm_nel", "max_age": 604800, "failure_fraction": 0.05, "success_fraction": + 0.0}' + X-Client-Ip: + - 102.244.157.204 + Accept-Ranges: + - bytes + Transfer-Encoding: + - chunked + body: + encoding: ASCII-8BIT + string: '{"enwiki":{"models":{"articlequality":{"version":"0.9.2"}},"scores":{"1220423548":{"articlequality":{"score":{"prediction":"Start","probability":{"B":0.0967005597473408,"C":0.33396017760551916,"FA":0.00454057782408097,"GA":0.012108337779692136,"Start":0.5182220232989376,"Stub":0.03446832374442916}},"features":{"feature.wikitext.revision.chars":6782.0,"feature.wikitext.revision.content_chars":3161.0,"feature.wikitext.revision.ref_tags":5.0,"feature.wikitext.revision.wikilinks":17.0,"feature.wikitext.revision.external_links":12.0,"feature.wikitext.revision.headings_by_level(2)":3.0,"feature.wikitext.revision.headings_by_level(3)":0.0,"feature.wikitext.revision.list_items":8.0,"feature.enwiki.revision.image_links":0.0,"feature.enwiki.revision.image_template":0.0,"feature.enwiki.revision.images_in_templates":0,"feature.enwiki.revision.images_in_tags":0,"feature.enwiki.infobox_images":0,"feature.enwiki.revision.category_links":8.0,"feature.enwiki.revision.shortened_footnote_templates":0.0,"feature.enwiki.revision.cite_templates":12.0,"feature.wikitext.revision.templates":19.0,"feature.enwiki.revision.infobox_templates":1.0,"feature.enwiki.revision.cn_templates":0.0,"feature.enwiki.revision.who_templates":0.0,"feature.enwiki.main_article_templates":0.0,"feature.english.stemmed.revision.stems_length":3928,"feature.enwiki.revision.paragraphs_without_refs_total_length":3674.0,"feature.len()":1.0,"feature.len()":782.0,"feature.len()":0.0}}}}}}'
+ recorded_at: Tue, 28 Jan 2025 18:55:01 GMT
+recorded_with: VCR 6.1.0
diff --git a/lib/alerts/articles_for_deletion_monitor.rb b/lib/alerts/articles_for_deletion_monitor.rb
index 53a3c8b27b..e85e3ffe44 100644
--- a/lib/alerts/articles_for_deletion_monitor.rb
+++ b/lib/alerts/articles_for_deletion_monitor.rb
@@ -104,13 +104,10 @@ def normalize_titles
def create_alert(articles_course)
return if alert_already_exists?(articles_course)
- first_revision = articles_course
- .course.revisions.where(article_id: articles_course.article_id).first
alert = Alert.create!(type: 'ArticlesForDeletionAlert',
article_id: articles_course.article_id,
- user_id: first_revision&.user_id,
- course_id: articles_course.course_id,
- revision_id: first_revision&.id)
+ user_id: articles_course&.user_ids&.first,
+ course_id: articles_course.course_id)
alert.email_content_expert
end
diff --git a/lib/alerts/continued_course_activity_alert_manager.rb b/lib/alerts/continued_course_activity_alert_manager.rb
index 2a8e501f88..df868b4480 100644
--- a/lib/alerts/continued_course_activity_alert_manager.rb
+++ b/lib/alerts/continued_course_activity_alert_manager.rb
@@ -22,7 +22,7 @@ def create_alerts
private
- MINIMUM_CHARACTERS_ADDED_AFTER_COURSE_END = 1000
+ MINIMUM_CHARACTERS_ADDED_AFTER_COURSE_END = 200
def significant_activity_after_course_end?(course)
user_ids = course.students.pluck(:id)
post_course_characters = Revision
diff --git a/lib/alerts/dyk_nomination_monitor.rb b/lib/alerts/d_y_k_nomination_monitor.rb
similarity index 87%
rename from lib/alerts/dyk_nomination_monitor.rb
rename to lib/alerts/d_y_k_nomination_monitor.rb
index 3f8177b645..f905a649d4 100644
--- a/lib/alerts/dyk_nomination_monitor.rb
+++ b/lib/alerts/d_y_k_nomination_monitor.rb
@@ -54,13 +54,10 @@ def normalize_titles
def create_alert(articles_course)
return if alert_already_exists?(articles_course)
- first_revision = articles_course
- .course.revisions.where(article_id: articles_course.article_id).first
alert = Alert.create!(type: 'DYKNominationAlert',
article_id: articles_course.article_id,
- user_id: first_revision&.user_id,
- course_id: articles_course.course_id,
- revision_id: first_revision&.id)
+ user_id: articles_course&.user_ids&.first,
+ course_id: articles_course.course_id)
alert.email_instructors_and_wikipedia_experts
end
diff --git a/lib/alerts/discretionary_sanctions_monitor.rb b/lib/alerts/discretionary_sanctions_monitor.rb
index 1fb419261d..c5c09f3121 100644
--- a/lib/alerts/discretionary_sanctions_monitor.rb
+++ b/lib/alerts/discretionary_sanctions_monitor.rb
@@ -57,15 +57,11 @@ def normalize_titles
def create_edit_alert(articles_course)
return if unresolved_edit_alert_already_exists?(articles_course)
- revisions = articles_course.course.revisions.where(article_id: articles_course.article_id)
- last_revision = revisions.last
- return if resolved_edit_alert_covers_latest_revision?(articles_course, last_revision)
- first_revision = revisions.first
+ return if resolved_edit_alert_covers_latest_revision?(articles_course)
alert = Alert.create!(type: 'DiscretionarySanctionsEditAlert',
article_id: articles_course.article_id,
- user_id: first_revision&.user_id,
- course_id: articles_course.course_id,
- revision_id: first_revision&.id)
+ user_id: articles_course&.user_ids&.first,
+ course_id: articles_course.course_id)
alert.email_content_expert
end
@@ -90,12 +86,58 @@ def unresolved_assignment_alert_already_exists?(assignments_course)
resolved: false)
end
- def resolved_edit_alert_covers_latest_revision?(articles_course, last_revision)
- return false if last_revision.nil?
+ def resolved_edit_alert_covers_latest_revision?(articles_course)
last_resolved = DiscretionarySanctionsEditAlert.where(article_id: articles_course.article_id,
course_id: articles_course.course_id,
resolved: true).last
return false unless last_resolved.present?
- last_resolved.created_at > last_revision.date
+
+ course = Course.find(articles_course.course_id)
+ # If the last resolved alert was created after the course end, do not create a new one
+ return true if last_resolved.created_at > course.end
+
+ mw_page_id = articles_course.article.mw_page_id
+ return !course_edit_after?(course, mw_page_id, last_resolved.created_at)
+ end
+
+ # Returns true if there was an edit made by a course student to the specified page
+ # within the period from the creation date of the last resolved alert to the course end date.
+ def course_edit_after?(course, page_id, last_resolved_date)
+ @api = WikiApi.new @wiki
+ @query_params = query_params(course, page_id, last_resolved_date)
+ @continue = true
+ until @continue.nil?
+ response = @api.query(@query_params)
+ return false unless response
+ reivisons = filter_revisions(response, page_id, course)
+ # If we found an edit made by the user then return true
+ return true if reivisons.present?
+ @continue = response['continue']
+ @query_params['rvcontinue'] = @continue['rvcontinue'] if @continue
+ end
+ false
+ end
+
+ # Filters the API response to exclude edits made by users who are not course students.
+ # Returns only the edits associated with the course.
+ def filter_revisions(response, page_id, course)
+ revisions = response.data['pages'][page_id.to_s]['revisions']
+ return if revisions.nil?
+ students = course.students.pluck(:username)
+ revisions.select { |revision| students.include?(revision['user']) }
+ end
+
+ # Queries for edits made to the specified page within the period
+ # [last resolved alert, course end]
+ def query_params(course, page_id, last_resolved_date)
+ {
+ action: 'query',
+ prop: 'revisions',
+ pageids: page_id,
+ rvend: last_resolved_date.strftime('%Y%m%d%H%M%S'),
+ rvstart: course.end.strftime('%Y%m%d%H%M%S'),
+ rvdir: 'older', # List newest first. rvstart has to be later than rvend.
+ rvlimit: 500
+ }
end
end
diff --git a/lib/alerts/ga_nomination_monitor.rb b/lib/alerts/g_a_nomination_monitor.rb
similarity index 85%
rename from lib/alerts/ga_nomination_monitor.rb
rename to lib/alerts/g_a_nomination_monitor.rb
index 6e3cd7b194..aa9d2f9001 100644
--- a/lib/alerts/ga_nomination_monitor.rb
+++ b/lib/alerts/g_a_nomination_monitor.rb
@@ -50,13 +50,10 @@ def normalize_titles
def create_alert(articles_course)
return if alert_already_exists?(articles_course)
- first_revision = articles_course
- .course.revisions.where(article_id: articles_course.article_id).first
alert = Alert.create!(type: 'GANominationAlert',
article_id: articles_course.article_id,
- user_id: first_revision&.user_id,
- course_id: articles_course.course_id,
- revision_id: first_revision&.id)
+ user_id: articles_course&.user_ids&.first,
+ course_id: articles_course.course_id)
alert.email_content_expert
end
diff --git a/lib/alerts/high_quality_article_monitor.rb b/lib/alerts/high_quality_article_monitor.rb
index 4a7abeb7b2..9480aabcc5 100644
--- a/lib/alerts/high_quality_article_monitor.rb
+++ b/lib/alerts/high_quality_article_monitor.rb
@@ -51,15 +51,11 @@ def normalize_titles
def create_edit_alert(articles_course)
return if unresolved_edit_alert_already_exists?(articles_course)
- revisions = articles_course.course.revisions.where(article_id: articles_course.article_id)
- last_revision = revisions.last
- return if resolved_alert_covers_latest_revision?(articles_course, last_revision)
- first_revision = revisions.first
+ return if resolved_alert_covers_latest_revision?(articles_course)
alert = Alert.create!(type: 'HighQualityArticleEditAlert',
article_id: articles_course.article_id,
- user_id: first_revision&.user_id,
- course_id: articles_course.course_id,
- revision_id: first_revision&.id)
+ user_id: articles_course&.user_ids&.first,
+ course_id: articles_course.course_id)
alert.email_content_expert
end
@@ -84,12 +80,58 @@ def unresolved_assignment_alert_already_exists?(assignments_course)
resolved: false)
end
- def resolved_alert_covers_latest_revision?(articles_course, last_revision)
- return false if last_revision.nil?
+ def resolved_alert_covers_latest_revision?(articles_course)
last_resolved = HighQualityArticleEditAlert.where(article_id: articles_course.article_id,
course_id: articles_course.course_id,
resolved: true).last
return false unless last_resolved.present?
- last_resolved.created_at > last_revision.date
+
+ course = Course.find(articles_course.course_id)
+ # If the last resolved alert was created after the course end, do not create a new one
+ return true if last_resolved.created_at > course.end
+
+ mw_page_id = articles_course.article.mw_page_id
+ return !course_edit_after?(course, mw_page_id, last_resolved.created_at)
+ end
+
+ # Returns true if there was an edit made by a course student to the specified page
+ # within the period from the creation date of the last resolved alert to the course end date.
+ def course_edit_after?(course, page_id, last_resolved_date)
+ @api = WikiApi.new @wiki
+ @query_params = query_params(course, page_id, last_resolved_date)
+ @continue = true
+ until @continue.nil?
+ response = @api.query(@query_params)
+ return false unless response
+ reivisons = filter_revisions(response, page_id, course)
+ # If we found an edit made by the user then return true
+ return true if reivisons.present?
+ @continue = response['continue']
+ @query_params['rvcontinue'] = @continue['rvcontinue'] if @continue
+ end
+ false
+ end
+
+ # Filters the API response to exclude edits made by users who are not course students.
+ # Returns only the edits associated with the course.
+ def filter_revisions(response, page_id, course)
+ revisions = response.data['pages'][page_id.to_s]['revisions']
+ return if revisions.nil?
+ students = course.students.pluck(:username)
+ revisions.select { |revision| students.include?(revision['user']) }
+ end
+
+ # Queries for edits made to the specified page within the period
+ # [last resolved alert, course end]
+ def query_params(course, page_id, last_resolved_date)
+ {
+ action: 'query',
+ prop: 'revisions',
+ pageids: page_id,
+ rvend: last_resolved_date.strftime('%Y%m%d%H%M%S'),
+ rvstart: course.end.strftime('%Y%m%d%H%M%S'),
+ rvdir: 'older', # List newest first. rvstart has to be later than rvend.
+ rvlimit: 500
+ }
end
end
diff --git a/lib/assignment_manager.rb b/lib/assignment_manager.rb
index 313cec6422..d1bd7af70f 100644
--- a/lib/assignment_manager.rb
+++ b/lib/assignment_manager.rb
@@ -107,10 +107,12 @@ def set_article_from_database
def check_wiki_edu_discouraged_article
category = Category.find_by(name: ENV['blocked_assignment_category'])
+ article_discouraged = (category.present? && category.article_titles.include?(@clean_title))
+ handle_discouraged_article if article_discouraged
+ end
- if category.present? && category.article_titles.include?(@clean_title)
- raise DiscouragedArticleError, I18n.t('assignments.blocked_assignment', title: @clean_title)
- end
+ def handle_discouraged_article
+ raise DiscouragedArticleError, I18n.t('assignments.blocked_assignment', title: @clean_title)
end
def import_article_from_wiki
diff --git a/lib/data_cycle/update_cycle_alert_generator.rb b/lib/data_cycle/update_cycle_alert_generator.rb
index 33e5722eee..0212f190dd 100644
--- a/lib/data_cycle/update_cycle_alert_generator.rb
+++ b/lib/data_cycle/update_cycle_alert_generator.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
require_dependency "#{Rails.root}/lib/alerts/articles_for_deletion_monitor"
-require_dependency "#{Rails.root}/lib/alerts/dyk_nomination_monitor"
-require_dependency "#{Rails.root}/lib/alerts/ga_nomination_monitor"
+require_dependency "#{Rails.root}/lib/alerts/d_y_k_nomination_monitor"
+require_dependency "#{Rails.root}/lib/alerts/g_a_nomination_monitor"
require_dependency "#{Rails.root}/lib/alerts/course_alert_manager"
require_dependency "#{Rails.root}/lib/alerts/survey_response_alert_manager"
require_dependency "#{Rails.root}/lib/alerts/discretionary_sanctions_monitor"
diff --git a/lib/importers/user_importer.rb b/lib/importers/user_importer.rb
index c1feebbc5a..cbeab717e8 100644
--- a/lib/importers/user_importer.rb
+++ b/lib/importers/user_importer.rb
@@ -114,7 +114,7 @@ def self.get_global_id(username)
def self.update_user_from_wiki(user, wiki)
user_data = WikiApi.new(wiki).get_user_info(user.username)
- return if user_data['missing']
+ return if user_data.nil? || user_data['missing']
user.update!(username: user_data['name'],
registered_at: user_data['registration'],
global_id: user_data&.dig('centralids', 'CentralAuth'))
diff --git a/lib/lift_wing_api.rb b/lib/lift_wing_api.rb
index 7e3b949b2b..47ce0ccd53 100644
--- a/lib/lift_wing_api.rb
+++ b/lib/lift_wing_api.rb
@@ -20,6 +20,8 @@ class LiftWingApi
# All the wikis with an articlequality model as of 2023-06-28
# https://wikitech.wikimedia.org/wiki/Machine_Learning/LiftWingq
AVAILABLE_WIKIPEDIAS = %w[en eu fa fr gl nl pt ru sv tr uk].freeze
+ # config/initializers/retry_config.rb
+ RETRY_COUNT = 5
def self.valid_wiki?(wiki)
return true if wiki.project == 'wikidata'
@@ -51,7 +53,6 @@ def get_revision_data(rev_ids)
end
log_error_batch(rev_ids)
-
return results
end
@@ -60,7 +61,7 @@ def get_revision_data(rev_ids)
# Returns a hash with wp10, features, deleted, and prediction, or empty hash if
# there is an error.
def get_single_revision_parsed_data(rev_id)
- tries ||= 5
+ tries ||= RETRY_COUNT
body = { rev_id:, extended_output: true }.to_json
response = lift_wing_server.post(quality_query_url, body)
parsed_response = Oj.load(response.body)
@@ -69,7 +70,6 @@ def get_single_revision_parsed_data(rev_id)
return { 'wp10' => nil, 'features' => nil, 'deleted' => deleted?(parsed_response),
'prediction' => nil }
end
-
build_successful_response(rev_id, parsed_response)
rescue StandardError => e
tries -= 1
diff --git a/lib/list_course_manager.rb b/lib/list_course_manager.rb
index e541424eac..0208b9de11 100644
--- a/lib/list_course_manager.rb
+++ b/lib/list_course_manager.rb
@@ -39,12 +39,11 @@ def add_instructor_real_names
def add_classroom_program_manager_if_exists
cpm = SpecialUsers.classroom_program_manager
- if cpm && @course.type == 'ClassroomProgramCourse'
- CoursesUsers.create(user: cpm,
- course: @course,
- role: CoursesUsers::Roles::WIKI_ED_STAFF_ROLE,
- real_name: cpm.real_name)
- end
+ return unless cpm && @course.type == 'ClassroomProgramCourse'
+ CoursesUsers.create(user: cpm,
+ course: @course,
+ role: CoursesUsers::Roles::WIKI_ED_STAFF_ROLE,
+ real_name: cpm.real_name)
end
def send_approval_notification_emails
diff --git a/lib/personal_data/personal_data_csv_builder.rb b/lib/personal_data/personal_data_csv_builder.rb
new file mode 100644
index 0000000000..a5e27256d7
--- /dev/null
+++ b/lib/personal_data/personal_data_csv_builder.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module PersonalData
+ class PersonalDataCsvBuilder
+ def initialize(user)
+ @user = user
+ end
+
+ def generate_csv
+ CSV.generate(headers: true) do |csv|
+ add_user_info(csv)
+ add_user_profile_info(csv)
+ add_course_info(csv)
+ add_campaign_info(csv)
+ end
+ end
+
+ private
+
+ def add_user_info(csv)
+ csv << ['Username', 'Real Name', 'Email', 'Created At', 'Updated At', 'Locale', 'First Login']
+ csv << [
+ @user.username, @user.real_name, @user.email, @user.created_at,
+ @user.updated_at, @user.locale, @user.first_login
+ ]
+ end
+
+ def add_user_profile_info(csv)
+ return unless @user.user_profile
+
+ csv << [
+ 'Bio', 'Image File Name', 'Image Link', 'Image Updated At',
+ 'Location', 'Institution', 'Email Preferences'
+ ]
+ csv << [
+ @user.user_profile.bio, @user.user_profile.image_file_name,
+ @user.user_profile.image_file_link, @user.user_profile.image_updated_at,
+ @user.user_profile.location, @user.user_profile.institution,
+ @user.user_profile.email_preferences
+ ]
+ end
+
+ def add_course_info(csv)
+ @user.courses_users.includes(:course).each do |course_user|
+ csv << [
+ 'Course', 'Role', 'Real Name', 'Role Description',
+ 'Character Sum MS', 'Character Sum US', 'Character Sum Draft',
+ 'Revision Count', 'References Count', 'Recent Revisions', 'Enrolled At'
+ ]
+ csv << [
+ course_user.course.slug, course_user.role, course_user.real_name,
+ course_user.role_description, course_user.character_sum_ms,
+ course_user.character_sum_us, course_user.character_sum_draft,
+ course_user.revision_count, course_user.references_count,
+ course_user.recent_revisions, course_user.created_at
+ ]
+
+ add_assignments_info(csv, course_user)
+ end
+ end
+
+ def add_assignments_info(csv, course_user)
+ course_user.assignments.each do |assignment|
+ csv << ['Assignment Title', 'Assignment URL', 'Role', 'Created At', 'Sandbox URL']
+ csv << [
+ assignment.article_title, assignment.article_url,
+ assignment.role, assignment.created_at, assignment.sandbox_url
+ ]
+ end
+ end
+
+ def add_campaign_info(csv)
+ @user.campaigns_users.includes(:campaign).each do |campaign_user|
+ csv << ['Campaign', 'Joined At']
+ csv << [campaign_user.campaign.slug, campaign_user.created_at]
+ end
+ end
+ end
+end
diff --git a/lib/petscan_api.rb b/lib/petscan_api.rb
index 3dcddfb12d..cfe680e562 100644
--- a/lib/petscan_api.rb
+++ b/lib/petscan_api.rb
@@ -8,7 +8,6 @@ class PetScanApi
def get_data(psid, update_service: nil)
url = query_url(psid)
response = petscan.get url
- puts response.body
Oj.load(response.body)
rescue StandardError => e
log_error(e, update_service:,
diff --git a/lib/reference_counter_api.rb b/lib/reference_counter_api.rb
index cd51cb023b..b70d79e44d 100644
--- a/lib/reference_counter_api.rb
+++ b/lib/reference_counter_api.rb
@@ -56,15 +56,12 @@ def get_number_of_references_from_revision_id(rev_id)
tries ||= 5
response = toolforge_server.get(references_query_url(rev_id))
parsed_response = Oj.load(response.body)
- if response.status == 200
- return { 'num_ref' => parsed_response['num_ref'] }
- else
- # Log the error and return empty hash
- # Sentry.capture_message 'Non-200 response hitting references counter API', level: 'warning',
- # extra: { project_code: @project_code, language_code: @language_code, rev_id:,
- # status_code: response.status, content: parsed_response }
- return { 'num_ref' => nil }
- end
+ return { 'num_ref' => parsed_response['num_ref'] } if response.status == 200
+ # Log the error and return empty hash
+ # Sentry.capture_message 'Non-200 response hitting references counter API', level: 'warning',
+ # extra: { project_code: @project_code, language_code: @language_code, rev_id:,
+ # status_code: response.status, content: parsed_response }
+ return { 'num_ref' => nil }
rescue StandardError => e
tries -= 1
retry unless tries.zero?
diff --git a/lib/revision_feedback_service.rb b/lib/revision_feedback_service.rb
index 356b426ee1..fbba09f3a9 100644
--- a/lib/revision_feedback_service.rb
+++ b/lib/revision_feedback_service.rb
@@ -19,9 +19,8 @@ def feedback
def citation_feedback
ref_tags = @features['feature.wikitext.revision.ref_tags']
# cite_templates = @features['feature.enwiki.revision.cite_templates']
- if ref_tags < MINIMUM_REFERENCES
- @feedback << 'Cite your sources! This article needs more references.'
- end
+ return unless ref_tags < MINIMUM_REFERENCES
+ @feedback << 'Cite your sources! This article needs more references.'
end
# The largest reasonable average section size, calculated from content characters
diff --git a/lib/revision_score_api_handler.rb b/lib/revision_score_api_handler.rb
index 5cfc9c757f..8d9a8973d1 100644
--- a/lib/revision_score_api_handler.rb
+++ b/lib/revision_score_api_handler.rb
@@ -14,9 +14,8 @@ def initialize(language: 'en', project: 'wikipedia', wiki: nil, update_service:
# Initialize LiftWingApi if the wiki is valid for it
@lift_wing_api = LiftWingApi.new(@wiki, @update_service) if LiftWingApi.valid_wiki?(@wiki)
# Initialize ReferenceCounterApi if the wiki is valid for it
- if ReferenceCounterApi.valid_wiki?(@wiki)
- @reference_counter_api = ReferenceCounterApi.new(@wiki, @update_service)
- end
+ return unless ReferenceCounterApi.valid_wiki?(@wiki)
+ @reference_counter_api = ReferenceCounterApi.new(@wiki, @update_service)
end
# Returns data from LiftWing API and/or reference-counter API.
diff --git a/lib/training_module_due_date_manager.rb b/lib/training_module_due_date_manager.rb
index cba43334dc..178878a316 100644
--- a/lib/training_module_due_date_manager.rb
+++ b/lib/training_module_due_date_manager.rb
@@ -49,11 +49,8 @@ def module_progress
def flags(course_id)
flags_hash = @tmu&.flags
- if @training_module.exercise? && flags_hash.present?
- return flags_hash[course_id] || flags_hash
- else
- return flags_hash
- end
+ return flags_hash[course_id] || flags_hash if @training_module.exercise? && flags_hash.present?
+ return flags_hash
end
def sandbox_url
diff --git a/lib/wiki_api.rb b/lib/wiki_api.rb
index 65ddce0a7c..4f8b1f9fa0 100644
--- a/lib/wiki_api.rb
+++ b/lib/wiki_api.rb
@@ -33,6 +33,8 @@ def get_page_content(page_title)
response.body.force_encoding('UTF-8')
when 404
''
+ else
+ raise PageFetchError.new(page_title, response&.status)
end
end
@@ -47,7 +49,7 @@ def get_user_info(username)
ususers: username,
usprop: 'centralids|registration' }
user_data = mediawiki('query', user_query)
- return unless user_data.data['users'].any?
+ return unless user_data&.data&.dig('users')&.any?
user_data.data['users'][0]
end
@@ -121,6 +123,13 @@ def too_many_requests?(e)
e.status == 429
end
+ class PageFetchError < StandardError
+ def initialize(page, status)
+ message = "Failed to fetch content for #{page} with response status: #{status.inspect}"
+ super(message)
+ end
+ end
+
TYPICAL_ERRORS = [Faraday::TimeoutError,
Faraday::ConnectionFailed,
MediawikiApi::HttpError,
diff --git a/package.json b/package.json
index 8202d304dc..b53d61afbf 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
"eslint-plugin-react": "^7.20.5",
"fetch-jsonp": "^1.2.1",
"i18n-js": "^4.2.2",
+ "immer": "^10.1.1",
"jeet": "^7.2.0",
"jest": "^26.0.1",
"jquery": "^3.5.1",
diff --git a/spec/controllers/system_status_controller_spec.rb b/spec/controllers/system_status_controller_spec.rb
new file mode 100644
index 0000000000..0c44b81636
--- /dev/null
+++ b/spec/controllers/system_status_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe SystemStatusController, type: :request do
+ describe '#index' do
+ it 'sets @sidekiq_stats' do
+ get '/status'
+
+ expect(assigns(:sidekiq_stats)).to be_a(Hash)
+ expect(assigns(:sidekiq_stats)).to include(:enqueued_jobs, :active_jobs)
+ end
+
+ it 'sets @queue_metrics' do
+ get '/status'
+
+ queue_metrics = assigns(:queue_metrics)
+ expect(queue_metrics).to be_a(Hash)
+ expect(queue_metrics).to include(:queues, :paused_queues, :all_operational)
+
+ expect(queue_metrics[:queues]).to all(include(:name, :size, :status, :latency))
+ end
+
+ it 'renders the index template' do
+ get '/status'
+ expect(response).to render_template(:index)
+ end
+ end
+end
diff --git a/spec/controllers/users/enrollment_controller_spec.rb b/spec/controllers/users/enrollment_controller_spec.rb
index fa472f7c8a..9c7526a863 100644
--- a/spec/controllers/users/enrollment_controller_spec.rb
+++ b/spec/controllers/users/enrollment_controller_spec.rb
@@ -18,6 +18,7 @@
allow_any_instance_of(WikiCourseEdits).to receive(:update_course)
allow_any_instance_of(WikiCourseEdits).to receive(:remove_assignment)
allow_any_instance_of(WikiCourseEdits).to receive(:update_assignments)
+ allow_any_instance_of(WikiApi).to receive(:get_page_content).and_return('Some content')
allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
course.campaigns << Campaign.first
end
diff --git a/spec/features/account_requests_spec.rb b/spec/features/account_requests_spec.rb
index b1ad0bb9ac..7f56875a5d 100644
--- a/spec/features/account_requests_spec.rb
+++ b/spec/features/account_requests_spec.rb
@@ -15,6 +15,7 @@
end
it 'can be enabled by the course facilitator' do
+ pending 'Confirmation modal is not displaying'
login_as(instructor)
visit "/courses/#{course.slug}"
click_button 'Enable account requests'
@@ -23,6 +24,7 @@
click_button 'OK'
end
expect(page).to have_content('Account request generation enabled')
+ pass_pending_spec
end
it 'can be used by logged out users via the enroll link' do
diff --git a/spec/features/assigned_articles_spec.rb b/spec/features/assigned_articles_spec.rb
index 9f2822673c..b9de285fd1 100644
--- a/spec/features/assigned_articles_spec.rb
+++ b/spec/features/assigned_articles_spec.rb
@@ -19,11 +19,10 @@
it 'lets users submit feedback about articles' do
# This makes a call to the LiftWing API from the server,
# we need to use VCR to avoid getting stopped by WebMock
- VCR.use_cassette('assigned_articles_view') do
+ VCR.use_cassette('cached/assigned_articles_view') do
visit "/courses/#{course.slug}/articles/assigned"
expect(page).to have_content('Nancy Tuana')
find('a', text: 'Feedback').click
- expect(page).to have_no_content(I18n.t('courses.feedback_loading'), wait: 10)
expect(page).to have_selector('textarea.feedback-form')
find('textarea.feedback-form').fill_in with: 'This is a great article!'
click_button 'Add Suggestion'
diff --git a/spec/features/multiwiki_assignment_spec.rb b/spec/features/multiwiki_assignment_spec.rb
index d119d009d4..ee1a6e99a5 100644
--- a/spec/features/multiwiki_assignment_spec.rb
+++ b/spec/features/multiwiki_assignment_spec.rb
@@ -58,7 +58,8 @@
within('#users') do
first('textarea').set(
- "Terre\nhttps://fr.wikipedia.org/wiki/Anglais"
+ "Terre\nhttps://fr.wikipedia.org/wiki/Anglais",
+ rapid: false
)
end
click_button 'Assign all'
@@ -86,7 +87,7 @@
button.click
within('#users') do
- find('textarea', visible: true).set('No le des prisa, dolor')
+ find('textarea', visible: true).set('No le des prisa, dolor', rapid: false)
click_link 'Change'
find('div.wiki-select').click
within('.wiki-select') do
@@ -116,7 +117,7 @@
expect(button).to have_content 'Assign/remove an article'
button.click
within('#users') do
- first('textarea').set('https://wikisource.org/wiki/Heyder_Cansa')
+ first('textarea').set('https://wikisource.org/wiki/Heyder_Cansa', rapid: false)
end
click_button 'Assign'
visit "/courses/#{course.slug}/students/articles"
@@ -139,7 +140,8 @@
expect(button).to have_content 'Assign/remove an article'
button.click
within('#users') do
- first('textarea').set('https://incubator.wikimedia.org/wiki/Wp/kiu/Heyder_Cansa')
+ first('textarea').set('https://incubator.wikimedia.org/wiki/Wp/kiu/Heyder_Cansa',
+ rapid: false)
end
click_button 'Assign'
visit "/courses/#{course.slug}/students/articles"
diff --git a/spec/features/student_role_spec.rb b/spec/features/student_role_spec.rb
index d6c124ae2c..361904049d 100644
--- a/spec/features/student_role_spec.rb
+++ b/spec/features/student_role_spec.rb
@@ -15,8 +15,8 @@
slug: 'University/An_Example_Course_(Term)',
submitted: true,
passcode: 'passcode',
- start: '2015-01-01'.to_date,
- end: '2025-01-01'.to_date)
+ start: '2025-01-01'.to_date,
+ end: 1.month.from_now)
end
let!(:editathon) do
create(:editathon,
@@ -26,8 +26,8 @@
slug: 'University/An_Example_Editathon_(Term)',
submitted: true,
passcode: '',
- start: '2015-01-01'.to_date,
- end: '2025-01-01'.to_date)
+ start: '2025-01-01'.to_date,
+ end: 1.month.from_now)
end
before do
diff --git a/spec/features/survey_bugs_spec.rb b/spec/features/survey_bugs_spec.rb
index e367f88cd7..9e0b02299a 100644
--- a/spec/features/survey_bugs_spec.rb
+++ b/spec/features/survey_bugs_spec.rb
@@ -128,14 +128,8 @@
click_button('Next', visible: true) # Q2
end
- # Now this question ideally should be skipped
- # but the code that did that breaks the survey
- # by removing the question without sliding
- # the next one into view.
- find('.label', text: 'Maybe').click
- within('div[data-progress-index="4"]') do
- click_button('Next', visible: true) # Q3
- end
+ sleep 2
+ expect(page).to have_content('Submit Survey')
# Now we can actually submit the survey
# and finish.
diff --git a/spec/features/training_tool_spec.rb b/spec/features/training_tool_spec.rb
index c51affa193..8b1d2c2b8f 100644
--- a/spec/features/training_tool_spec.rb
+++ b/spec/features/training_tool_spec.rb
@@ -2,11 +2,11 @@
require 'rails_helper'
-DESIRED_TRAINING_MODULES = [{ slug: 'evaluating-articles' }].freeze
+DESIRED_TRAINING_MODULES = [{ slug: 'sandboxes-talk-watchlists' }].freeze
describe 'Training', type: :feature, js: true do
let(:user) { create(:user, id: 1) }
- let(:module_2) { TrainingModule.find_by(slug: 'evaluating-articles') }
+ let(:module_2) { TrainingModule.find_by(slug: 'sandboxes-talk-watchlists') }
let(:new_instructor_orientation_module) do
TrainingModule.find_by(slug: 'new-instructor-orientation')
end
@@ -130,7 +130,7 @@
tmu = TrainingModulesUsers.find_by(user_id: user.id,
training_module_id: new_instructor_orientation_module.id)
visit "/training/students/#{new_instructor_orientation_module.slug}
- /#{new_instructor_orientation_module.slides.last.slug}"
+ /#{new_instructor_orientation_module.slides.last.slug}"
sleep 2
expect(tmu.reload.completed_at).to be_between(1.minute.ago, 1.minute.from_now)
expect(user.reload.permissions).to eq(User::Permissions::INSTRUCTOR)
@@ -209,6 +209,11 @@
end
describe 'finish module button' do
+ before do
+ TrainingSlide.load
+ visit "/training/students/#{module_2.slug}"
+ end
+
context 'logged in user' do
it 'redirects to their dashboard' do
login_as(user, scope: :user)
@@ -236,13 +241,13 @@
end
end
- DESIRED_TRAINING_MODULES.each do |module_slug|
- describe "'#{module_slug[:slug]}' module" do
- before do
- TrainingSlide.load
- end
+ describe 'lets the user go from start to finish' do
+ before do
+ TrainingSlide.load
+ end
- it 'lets the user go from start to finish' do
+ DESIRED_TRAINING_MODULES.each do |module_slug|
+ it "'#{module_slug[:slug]}' module" do
training_module = TrainingModule.find_by(module_slug)
go_through_module_from_start_to_finish(training_module)
end
@@ -279,7 +284,7 @@ def check_slide_contents(slide, slide_number, slide_count)
end
def proceed_to_next_slide
- if page.has_selector?('.alert-box-container', wait: 10)
+ if page.has_selector?('.alert-box-container')
within('.alert-box-container') do
find('.alert-button').click
end
diff --git a/spec/helpers/uploads_helper_spec.rb b/spec/helpers/uploads_helper_spec.rb
index 91ae000087..d03f4c2c99 100644
--- a/spec/helpers/uploads_helper_spec.rb
+++ b/spec/helpers/uploads_helper_spec.rb
@@ -10,5 +10,14 @@
result = pretty_filename(upload)
expect(result).to eq('My file.jpg')
end
+
+ it 'formats a complex filename with encoded characters nicely for display' do
+ upload = build(:commons_upload,
+ # rubocop:disable Layout/LineLength
+ file_name: 'File%3AA+sunflower+%F0%9F%8C%BB%F0%9F%8C%BB+in+Kaduna+Polytechnic%2CSabo+Campus.jpg')
+ # rubocop:enable Layout/LineLength
+ result = pretty_filename(upload)
+ expect(result).to eq('A sunflower 🌻🌻 in Kaduna Polytechnic,Sabo Campus.jpg')
+ end
end
end
diff --git a/spec/lib/alerts/articles_for_deletion_monitor_spec.rb b/spec/lib/alerts/articles_for_deletion_monitor_spec.rb
index db9ac47cae..62c59f0ce4 100644
--- a/spec/lib/alerts/articles_for_deletion_monitor_spec.rb
+++ b/spec/lib/alerts/articles_for_deletion_monitor_spec.rb
@@ -23,30 +23,20 @@ def mock_mailer
# AFD article
let(:article) { create(:article, title: 'One_page', namespace: 0) }
- let(:revision) do
- create(:revision, article_id: article.id,
- user_id: student.id,
- date: course.start + 1.day,
- new_article: article_is_new)
- end
let(:articles_course) do
create(:articles_course, article_id: article.id,
course_id: course.id,
- new_article: article_is_new)
+ new_article: article_is_new,
+ user_ids: [student.id])
end
# PRODded article
let(:prod) { create(:article, title: 'PRODded_page', namespace: 0) }
- let!(:prod_revision) do
- create(:revision, article_id: prod.id,
- user_id: student.id,
- date: course.start + 1.day,
- new_article: article_is_new)
- end
let!(:prod_articles_course) do
create(:articles_course, article_id: prod.id,
course_id: course.id,
- new_article: article_is_new)
+ new_article: article_is_new,
+ user_ids: [student.id])
end
before do
@@ -73,7 +63,7 @@ def mock_mailer
context 'when there is a new article' do
let(:article_is_new) { true }
- before { articles_course && revision && courses_user }
+ before { articles_course && courses_user }
it 'creates Alert records for both AfD and PROD' do
described_class.create_alerts_for_course_articles
@@ -83,6 +73,21 @@ def mock_mailer
expect(alerted_article_ids).to include(prod.id)
end
+ it 'assigns user_id from articles_course.user_ids.first' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert.user_id).to eq(student.id) # First user_id from user_ids
+ end
+
+ it 'creates Alert records without requiring revisions' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert).not_to be_nil
+ expect(alert.revision_id).to be_nil # revision_id should not matter
+ end
+
it 'emails a greeter' do
create(:courses_user, user_id: content_expert.id, course_id: course.id, role: 4)
allow_any_instance_of(AlertMailer).to receive(:alert).and_return(mock_mailer)
@@ -98,7 +103,7 @@ def mock_mailer
expect(Alert.count).to eq(2)
end
- it 'does create second Alert if the first alert is resolved' do
+ it 'does create a second Alert if the first alert is resolved' do
Alert.create(type: 'ArticlesForDeletionAlert', article_id: article.id,
course_id: course.id, resolved: true)
Alert.create(type: 'ArticlesForDeletionAlert', article_id: prod.id, course_id: course.id)
@@ -111,9 +116,9 @@ def mock_mailer
context 'when there is not a new article' do
let(:article_is_new) { false }
- before { articles_course && revision && courses_user }
+ before { articles_course && courses_user }
- it 'does still creates an Alert record' do
+ it 'still creates an Alert record' do
described_class.create_alerts_for_course_articles
expect(Alert.count).to eq(2)
end
diff --git a/spec/lib/alerts/discretionary_sanctions_monitor_spec.rb b/spec/lib/alerts/discretionary_sanctions_monitor_spec.rb
index 59e6e3ca60..ccc7bc2cbb 100644
--- a/spec/lib/alerts/discretionary_sanctions_monitor_spec.rb
+++ b/spec/lib/alerts/discretionary_sanctions_monitor_spec.rb
@@ -9,8 +9,8 @@ def mock_mailer
describe DiscretionarySanctionsMonitor do
describe '.create_alerts_for_course_articles' do
- let(:course) { create(:course, start: 1.month.ago, end: 1.month.after) }
- let(:student) { create(:user, username: 'student') }
+ let(:course) { create(:course, start: '2024-12-10', end: '2025-01-20') }
+ let(:student) { create(:user, username: 'Gelasin') }
let!(:courses_user) do
create(:courses_user, user_id: student.id,
course_id: course.id,
@@ -22,15 +22,13 @@ def mock_mailer
let!(:article2) { create(:article, title: '1948_war', namespace: 0) }
# Article that has been edited by a student
- let(:article) { create(:article, title: 'Ahmed_Mohamed_clock_incident', namespace: 0) }
- let!(:revision) do
- create(:revision, article_id: article.id,
- user_id: student.id,
- date: course.start + 1.day)
+ let(:article) do
+ create(:article, title: 'Ahmed_Mohamed_clock_incident', mw_page_id: 47905394, namespace: 0)
end
let!(:articles_course) do
create(:articles_course, article_id: article.id,
- course_id: course.id)
+ course_id: course.id,
+ user_ids: [student.id, 45])
end
let!(:assignment) do
@@ -54,6 +52,8 @@ def mock_mailer
expect(DiscretionarySanctionsAssignmentAlert.count).to eq(1)
alerted_edit_article_ids = DiscretionarySanctionsEditAlert.all.pluck(:article_id)
expect(alerted_edit_article_ids).to include(article.id)
+ alerted_edit_user_ids = DiscretionarySanctionsEditAlert.all.pluck(:user_id)
+ expect(alerted_edit_user_ids).to include(student.id)
alerted_assignment_article_ids = DiscretionarySanctionsAssignmentAlert.all.pluck(:article_id)
expect(alerted_assignment_article_ids).to include(article.id)
end
@@ -83,17 +83,31 @@ def mock_mailer
it 'does not create second Alert if the first alert is resolved but there are no new edits' do
Alert.create(type: 'DiscretionarySanctionsEditAlert', article_id: article.id,
- course_id: course.id, resolved: true, created_at: revision.date + 1.hour)
+ course_id: course.id, resolved: true, created_at: course.end - 1.minute)
expect(DiscretionarySanctionsEditAlert.count).to eq(1)
- described_class.create_alerts_for_course_articles
+ VCR.use_cassette 'discretionary_sanctions_monitors' do
+ described_class.create_alerts_for_course_articles
+ end
expect(DiscretionarySanctionsEditAlert.count).to eq(1)
end
- it 'does create second Alert if the first alert is resolved and there are later edits' do
+ it 'does not create second Alert if the first alert is resolved but no new student edits' do
Alert.create(type: 'DiscretionarySanctionsEditAlert', article_id: article.id,
- course_id: course.id, resolved: true, created_at: revision.date - 1.hour)
+ course_id: course.id, resolved: true, created_at: course.start + 1.day)
expect(DiscretionarySanctionsEditAlert.count).to eq(1)
- described_class.create_alerts_for_course_articles
+ VCR.use_cassette 'discretionary_sanctions_monitors' do
+ described_class.create_alerts_for_course_articles
+ end
+ expect(DiscretionarySanctionsEditAlert.count).to eq(1)
+ end
+
+ it 'does create second Alert if the first alert is resolved and later student edits' do
+ Alert.create(type: 'DiscretionarySanctionsEditAlert', article_id: article.id,
+ course_id: course.id, resolved: true, created_at: course.start + 1.minute)
+ expect(DiscretionarySanctionsEditAlert.count).to eq(1)
+ VCR.use_cassette 'discretionary_sanctions_monitors' do
+ described_class.create_alerts_for_course_articles
+ end
expect(DiscretionarySanctionsEditAlert.count).to eq(2)
end
diff --git a/spec/lib/alerts/dyk_nomination_monitor_spec.rb b/spec/lib/alerts/dyk_nomination_monitor_spec.rb
index 6793e6c4bb..409fecc605 100644
--- a/spec/lib/alerts/dyk_nomination_monitor_spec.rb
+++ b/spec/lib/alerts/dyk_nomination_monitor_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'rails_helper'
-require "#{Rails.root}/lib/alerts/dyk_nomination_monitor"
+require "#{Rails.root}/lib/alerts/d_y_k_nomination_monitor"
describe DYKNominationMonitor do
describe '.create_alerts_for_course_articles' do
@@ -20,14 +20,10 @@
# DYK article
let(:article) { create(:article, title: 'Venus_and_Adonis_(Titian)', namespace: 0) }
- let(:revision) do
- create(:revision, article_id: article.id,
- user_id: student.id,
- date: course.start + 1.day)
- end
let(:articles_course) do
create(:articles_course, article_id: article.id,
- course_id: course.id)
+ course_id: course.id,
+ user_ids: [student.id]) # Add user_ids for testing user_id logic
end
before do
@@ -37,16 +33,31 @@
'Template:Did you know nominations/2017–18 London & South East Premier',
'Template:Did you know nominations/17776'])
- articles_course && revision && courses_user
+ articles_course && courses_user # Ensure `ArticlesCourses` and `CoursesUser` are created
end
- it 'creates an Alert recordfor the edited article' do
+ it 'creates an Alert record for the edited article' do
described_class.create_alerts_for_course_articles
expect(Alert.count).to eq(1)
alerted_article_ids = Alert.all.pluck(:article_id)
expect(alerted_article_ids).to include(article.id)
end
+ it 'assigns user_id from articles_course.user_ids.first' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert.user_id).to eq(student.id) # First user_id from user_ids
+ end
+
+ it 'does not depend on revisions for creating alerts' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert).not_to be_nil
+ expect(alert.revision_id).to be_nil # revision_id is not required
+ end
+
it 'emails a greeter' do
create(:courses_user, user_id: content_expert.id, course_id: course.id, role: 4)
described_class.create_alerts_for_course_articles
@@ -67,7 +78,7 @@
expect(Alert.count).to eq(1)
end
- it 'does create second Alert if the first alert is resolved' do
+ it 'does create a second Alert if the first alert is resolved' do
Alert.create(type: 'DYKNominationAlert', article_id: article.id,
course_id: course.id, resolved: true)
expect(Alert.count).to eq(1)
diff --git a/spec/lib/alerts/ga_nomination_monitor_spec.rb b/spec/lib/alerts/ga_nomination_monitor_spec.rb
index 55bf13c71c..791b44b334 100644
--- a/spec/lib/alerts/ga_nomination_monitor_spec.rb
+++ b/spec/lib/alerts/ga_nomination_monitor_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'rails_helper'
-require "#{Rails.root}/lib/alerts/ga_nomination_monitor"
+require "#{Rails.root}/lib/alerts/g_a_nomination_monitor"
def mock_mailer
OpenStruct.new(deliver_now: true)
@@ -23,14 +23,10 @@ def mock_mailer
# Good Article article
let(:article) { create(:article, title: 'Be_Here_Now_(George_Harrison_song)', namespace: 0) }
- let(:revision) do
- create(:revision, article_id: article.id,
- user_id: student.id,
- date: course.start + 1.day)
- end
let(:articles_course) do
create(:articles_course, article_id: article.id,
- course_id: course.id)
+ course_id: course.id,
+ user_ids: [student.id]) # Add user_ids for testing user_id logic
end
before do
@@ -40,7 +36,7 @@ def mock_mailer
'Talk:2017–18 London & South East Premier',
'Talk:17776'])
- articles_course && revision && courses_user
+ articles_course && courses_user # Ensure `ArticlesCourses` and `CoursesUser` are created
end
it 'creates an Alert record for the edited article' do
@@ -50,6 +46,21 @@ def mock_mailer
expect(alerted_article_ids).to include(article.id)
end
+ it 'assigns user_id from articles_course.user_ids.first' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert.user_id).to eq(student.id) # First user_id from user_ids
+ end
+
+ it 'does not depend on revisions for creating alerts' do
+ described_class.create_alerts_for_course_articles
+ alert = Alert.find_by(article_id: article.id)
+
+ expect(alert).not_to be_nil
+ expect(alert.revision_id).to be_nil # revision_id is not required
+ end
+
it 'emails a content expert' do
create(:courses_user, user_id: content_expert.id, course_id: course.id, role: 4)
allow_any_instance_of(AlertMailer).to receive(:alert).and_return(mock_mailer)
@@ -64,7 +75,7 @@ def mock_mailer
expect(Alert.count).to eq(1)
end
- it 'does create second Alert if the first alert is resolved' do
+ it 'does create a second Alert if the first alert is resolved' do
Alert.create(type: 'GANominationAlert', article_id: article.id,
course_id: course.id, resolved: true)
expect(Alert.count).to eq(1)
diff --git a/spec/lib/alerts/high_quality_article_monitor_spec.rb b/spec/lib/alerts/high_quality_article_monitor_spec.rb
index 55c29375d0..83c7798af2 100644
--- a/spec/lib/alerts/high_quality_article_monitor_spec.rb
+++ b/spec/lib/alerts/high_quality_article_monitor_spec.rb
@@ -5,8 +5,8 @@
describe HighQualityArticleMonitor do
describe '.create_alerts_for_course_articles' do
- let(:course) { create(:course, start: 1.month.ago, end: 1.month.after) }
- let(:student) { create(:user, username: 'student', email: 'learn@school.edu') }
+ let(:course) { create(:course, start: '2024-01-01', end: '2025-01-01') }
+ let(:student) { create(:user, username: 'Leemyongpak', email: 'learn@school.edu') }
let(:instructor) { create(:user, username: 'instructor', email: 'teach@school.edu') }
let!(:courses_user) do
create(:courses_user, user_id: student.id,
@@ -19,15 +19,11 @@
let!(:article2) { create(:article, title: 'History_of_aspirin', namespace: 0) }
# Featured article edited by student
- let(:article) { create(:article, title: 'Phan_Đình_Phùng', namespace: 0) }
- let!(:revision) do
- create(:revision, article_id: article.id,
- user_id: student.id,
- date: course.start + 1.day)
- end
+ let(:article) { create(:article, title: 'Phan_Đình_Phùng', mw_page_id: 10771083, namespace: 0) }
let!(:articles_course) do
create(:articles_course, article_id: article.id,
- course_id: course.id)
+ course_id: course.id,
+ user_ids: [student.id, 45])
end
let!(:assignment) do
create(:assignment, article_title: article.title,
@@ -53,22 +49,20 @@
end
it 'creates Alert records for edited Good articles' do
- VCR.use_cassette 'high_quality' do
- described_class.create_alerts_for_course_articles
- end
+ described_class.create_alerts_for_course_articles
expect(HighQualityArticleEditAlert.count).to eq(1)
expect(HighQualityArticleAssignmentAlert.count).to eq(1)
alerted_edit_article_ids = HighQualityArticleEditAlert.all.pluck(:article_id)
expect(alerted_edit_article_ids).to include(article.id)
+ alerted_edit_user_ids = HighQualityArticleEditAlert.all.pluck(:user_id)
+ expect(alerted_edit_user_ids).to include(student.id)
alerted_assignment_article_ids = HighQualityArticleAssignmentAlert.all.pluck(:article_id)
expect(alerted_assignment_article_ids).to include(article.id)
end
it 'emails a greeter' do
create(:courses_user, user_id: content_expert.id, course_id: course.id, role: 4)
- VCR.use_cassette 'high_quality' do
- described_class.create_alerts_for_course_articles
- end
+ described_class.create_alerts_for_course_articles
expect(Alert.last.email_sent_at).not_to be_nil
end
@@ -76,9 +70,7 @@
Alert.create(type: 'HighQualityArticleAssignmentAlert', article_id: assignment.article_id,
course_id: assignment.course_id, user_id: assignment.user_id)
expect(HighQualityArticleAssignmentAlert.count).to eq(1)
- VCR.use_cassette 'high_quality' do
- described_class.create_alerts_for_course_articles
- end
+ described_class.create_alerts_for_course_articles
expect(HighQualityArticleAssignmentAlert.count).to eq(1)
end
@@ -94,7 +86,17 @@
it 'does not create second Alert if the first alert is resolved but there are no new edits' do
Alert.create(type: 'HighQualityArticleEditAlert', article_id: article.id,
- course_id: course.id, resolved: true, created_at: revision.date + 1.hour)
+ course_id: course.id, resolved: true, created_at: course.end - 1.minute)
+ expect(HighQualityArticleEditAlert.count).to eq(1)
+ VCR.use_cassette 'high_quality' do
+ described_class.create_alerts_for_course_articles
+ end
+ expect(HighQualityArticleEditAlert.count).to eq(1)
+ end
+
+ it 'does not create second Alert if the first alert is resolved but no new student edits' do
+ Alert.create(type: 'HighQualityArticleEditAlert', article_id: article.id,
+ course_id: course.id, resolved: true, created_at: course.start + 2.months)
expect(HighQualityArticleEditAlert.count).to eq(1)
VCR.use_cassette 'high_quality' do
described_class.create_alerts_for_course_articles
@@ -102,9 +104,9 @@
expect(HighQualityArticleEditAlert.count).to eq(1)
end
- it 'does create second Alert if the first alert is resolved and there are later edits' do
+ it 'does create second Alert if the first alert is resolved and later student edits' do
Alert.create(type: 'HighQualityArticleEditAlert', article_id: article.id,
- course_id: course.id, resolved: true, created_at: revision.date - 1.hour)
+ course_id: course.id, resolved: true, created_at: course.start + 1.minute)
expect(HighQualityArticleEditAlert.count).to eq(1)
VCR.use_cassette 'high_quality' do
described_class.create_alerts_for_course_articles
diff --git a/spec/lib/importers/user_importer_spec.rb b/spec/lib/importers/user_importer_spec.rb
index fdb4d596d7..83ece5ff30 100644
--- a/spec/lib/importers/user_importer_spec.rb
+++ b/spec/lib/importers/user_importer_spec.rb
@@ -180,6 +180,16 @@
describe '.update_user_from_wiki' do
let(:course) { create(:course) }
+ let(:enwiki) { Wiki.get_or_create(language: 'en', project: 'wikipedia') }
+
+ context 'when get_user_info returns nil' do
+ it 'returns early without raising an error and does not update the user' do
+ user = create(:user, username: 'RageSoss')
+ allow_any_instance_of(WikiApi).to receive(:get_user_info).and_return(nil)
+ expect(user).not_to receive(:update!)
+ expect { described_class.update_user_from_wiki(user, enwiki) }.not_to raise_error
+ end
+ end
it 'cleans up records when there are collisions' do
VCR.use_cassette 'user/new_from_renamed_user' do
@@ -197,7 +207,6 @@
it 'sets the registration date from English Wikipedia' do
VCR.use_cassette 'user/enwiki_only_account' do
user = create(:user, username: 'Brady2421')
- enwiki = Wiki.get_or_create(language: 'en', project: 'wikipedia')
described_class.update_user_from_wiki(user, enwiki)
expect(user.registered_at).not_to be_nil
end
diff --git a/spec/lib/lift_wing_api_spec.rb b/spec/lib/lift_wing_api_spec.rb
index 487fbc9f29..737483e39b 100644
--- a/spec/lib/lift_wing_api_spec.rb
+++ b/spec/lib/lift_wing_api_spec.rb
@@ -25,9 +25,6 @@
# Get revision data for valid rev ids for English Wikipedia
let(:subject0) { lift_wing_api_class_en_wiki.get_revision_data(rev_ids) }
- # Get revision data for valid rev ids for Wikidata
- let(:subject1) { described_class.new(wiki).get_revision_data(rev_ids) }
-
# Get revision data for deleted rev ids for English Wikipedia
let(:subject2) { lift_wing_api_class_en_wiki.get_revision_data([deleted_rev_id]) }
@@ -47,8 +44,16 @@
end
end
- it 'fetches json from api.wikimedia.org for wikidata' do
- VCR.use_cassette 'liftwing_api/wikidata' do
+ context 'fetch json data from api.wikimedia.org' do
+ before do
+ stub_wiki_validation
+ stub_lift_wing_response
+ end
+
+ # Get revision data for valid rev ids for Wikidata
+ let(:subject1) { described_class.new(wiki).get_revision_data([829840084, 829840085]) }
+
+ it 'fetches data for wikidata' do
expect(subject1).to be_a(Hash)
expect(subject1.dig('829840084')).to have_key('wp10')
expect(subject1.dig('829840084', 'wp10')).to eq(nil)
diff --git a/spec/lib/personal_data/personal_data_csv_builder_spec.rb b/spec/lib/personal_data/personal_data_csv_builder_spec.rb
new file mode 100644
index 0000000000..e4175218a6
--- /dev/null
+++ b/spec/lib/personal_data/personal_data_csv_builder_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require "#{Rails.root}/lib/personal_data/personal_data_csv_builder"
+
+describe PersonalData::PersonalDataCsvBuilder, type: :request do
+ let(:user) do
+ create(:user,
+ username: 'Sage the Rage',
+ real_name: 'Sage Ross',
+ email: 'sage@example.com',
+ created_at: '2025-01-28 16:04:05 UTC',
+ updated_at: '2025-01-28 16:04:05 UTC',
+ locale: 'en',
+ first_login: '2025-01-27 16:04:05 UTC')
+ end
+
+ it 'logs in as the user, downloads personal data in CSV, and checks its content' do
+ login_as(user)
+
+ csv_content = described_class.new(user).generate_csv
+
+ csv_lines = csv_content.split("\n")
+
+ expect(csv_lines.count).to be >= 2
+
+ expect(csv_lines[0]).to include(
+ 'Username',
+ 'Real Name',
+ 'Email',
+ 'Created At',
+ 'Updated At',
+ 'Locale',
+ 'First Login'
+ )
+
+ expect(csv_lines[1]).to include(
+ 'Sage the Rage',
+ 'Sage Ross',
+ 'sage@example.com',
+ '2025-01-28 16:04:05 UTC',
+ '2025-01-28 16:04:05 UTC',
+ 'en',
+ '2025-01-27 16:04:05 UTC'
+ )
+ end
+end
diff --git a/spec/lib/reference_counter_api_spec.rb b/spec/lib/reference_counter_api_spec.rb
index 0b4cd20e7c..69d3ee1784 100644
--- a/spec/lib/reference_counter_api_spec.rb
+++ b/spec/lib/reference_counter_api_spec.rb
@@ -11,6 +11,7 @@
let(:wikidata) { Wiki.get_or_create(language: nil, project: 'wikidata') }
let(:deleted_rev_ids) { [708326238] }
let(:rev_ids) { [5006940, 5006942, 5006946] }
+ let(:response) { stub_reference_counter_response }
it 'raises InvalidProjectError if using wikidata project' do
expect do
@@ -18,12 +19,20 @@
end.to raise_error(described_class::InvalidProjectError)
end
- it 'returns the number of references if response is 200 OK', vcr: true do
- ref_counter_api = described_class.new(es_wiktionary)
- response = ref_counter_api.get_number_of_references_from_revision_ids rev_ids
- expect(response.dig('5006940', 'num_ref')).to eq(10)
- expect(response.dig('5006942', 'num_ref')).to eq(4)
- expect(response.dig('5006946', 'num_ref')).to eq(2)
+ context 'returns the number of references' do
+ before do
+ stub_wiki_validation
+ stub_reference_counter_response
+ end
+
+ # Get revision data for valid rev ids for Wikidata
+ it 'if response is 200 OK', vcr: true do
+ ref_counter_api = described_class.new(es_wiktionary)
+ response = ref_counter_api.get_number_of_references_from_revision_ids rev_ids
+ expect(response.dig('5006940', 'num_ref')).to eq(10)
+ expect(response.dig('5006942', 'num_ref')).to eq(4)
+ expect(response.dig('5006946', 'num_ref')).to eq(2)
+ end
end
# it 'logs the message if response is not 200 OK', vcr: true do
diff --git a/spec/lib/revision_score_api_handler_spec.rb b/spec/lib/revision_score_api_handler_spec.rb
index 2292f50f7b..c77c6461d6 100644
--- a/spec/lib/revision_score_api_handler_spec.rb
+++ b/spec/lib/revision_score_api_handler_spec.rb
@@ -9,7 +9,7 @@
let(:subject) { handler.get_revision_data [829840090, 829840091] }
describe '#get_revision_data' do
- it 'returns completed scores if retrieves data without errors' do
+ it 'returns completed scores if data is retrieved without errors' do
VCR.use_cassette 'revision_score_api_handler/en_wikipedia' do
expect(subject).to be_a(Hash)
expect(subject.dig('829840090', 'wp10').to_f).to be_within(0.01).of(62.81)
@@ -28,15 +28,26 @@
end
end
- it 'returns completed scores if there is an error hitting LiftWingApi' do
- VCR.use_cassette 'revision_score_api_handler/en_wikipedia_liftwing_error' do
- stub_request(:any, /.*api.wikimedia.org.*/)
- .to_raise(Errno::ETIMEDOUT)
- expect(subject).to be_a(Hash)
- expect(subject.dig('829840090')).to eq({ 'wp10' => nil,
- 'features' => { 'num_ref' => 132 }, 'deleted' => false, 'prediction' => nil })
- expect(subject.dig('829840091')).to eq({ 'wp10' => nil,
- 'features' => { 'num_ref' => 1 }, 'deleted' => false, 'prediction' => nil })
+ describe 'error hitting LiftWingApi' do
+ before do
+ stub_wiki_validation
+ stub_revision_score_reference_counter_reponse
+ end
+
+ let(:wiki) { create(:wiki, project: 'wikipedia', language: 'es') }
+ let(:handler) { described_class.new(wiki:) }
+ let(:subject) { handler.get_revision_data [829840090, 829840091] }
+
+ it 'returns completed scores if there is an error hitting LiftWingApi' do
+ VCR.use_cassette 'revision_score_api_handler/en_wikipedia_liftwing_error' do
+ stub_request(:any, /.*api.wikimedia.org.*/)
+ .to_raise(Errno::ETIMEDOUT)
+ expect(subject).to be_a(Hash)
+ expect(subject.dig('829840090')).to eq({ 'wp10' => nil,
+ 'features' => { 'num_ref' => 132 }, 'deleted' => false, 'prediction' => nil })
+ expect(subject.dig('829840091')).to eq({ 'wp10' => nil,
+ 'features' => { 'num_ref' => 1 }, 'deleted' => false, 'prediction' => nil })
+ end
end
end
@@ -76,34 +87,36 @@
end
context 'when the wiki is available only for LiftWing API' do
- before { stub_wiki_validation }
-
let(:wiki) { create(:wiki, project: 'wikidata', language: nil) }
let(:handler) { described_class.new(wiki:) }
- let(:subject) { handler.get_revision_data [144495297, 144495298] }
+
+ before do
+ stub_wiki_validation
+ stub_revision_score_lift_wing_reponse
+ end
describe '#get_revision_data' do
- it 'returns completed scores if retrieves data without errors' do
- VCR.use_cassette 'revision_score_api_handler/wikidata' do
- expect(subject).to be_a(Hash)
- expect(subject.dig('144495297', 'wp10').to_f).to eq(0)
- expect(subject.dig('144495297', 'features')).to be_a(Hash)
- expect(subject.dig('144495297', 'features',
- 'feature.len()')).to eq(2)
- # 'num_ref' key doesn't exist for wikidata features
- expect(subject.dig('144495297', 'features').key?('num_ref')).to eq(false)
- expect(subject.dig('144495297', 'deleted')).to eq(false)
- expect(subject.dig('144495297', 'prediction')).to eq('D')
-
- expect(subject.dig('144495298', 'wp10').to_f).to eq(0)
- expect(subject.dig('144495298', 'features')).to be_a(Hash)
- expect(subject.dig('144495298', 'features',
- 'feature.len()')).to eq(0)
- # 'num_ref' key doesn't exist for wikidata features
- expect(subject.dig('144495298', 'features').key?('num_ref')).to eq(false)
- expect(subject.dig('144495298', 'deleted')).to eq(false)
- expect(subject.dig('144495298', 'prediction')).to eq('E')
- end
+ let(:subject) { handler.get_revision_data [144495297, 144495298] }
+
+ it 'returns completed scores if data is retrieved without errors' do
+ expect(subject).to be_a(Hash)
+ expect(subject.dig('144495297', 'wp10').to_f).to eq(0)
+ expect(subject.dig('144495297', 'features')).to be_a(Hash)
+ expect(subject.dig('144495297', 'features',
+ 'feature.len()')).to eq(2)
+ # 'num_ref' key doesn't exist for wikidata features
+ expect(subject.dig('144495297', 'features').key?('num_ref')).to eq(false)
+ expect(subject.dig('144495297', 'deleted')).to eq(false)
+ expect(subject.dig('144495297', 'prediction')).to eq('D')
+
+ expect(subject.dig('144495298', 'wp10').to_f).to eq(0)
+ expect(subject.dig('144495298', 'features')).to be_a(Hash)
+ expect(subject.dig('144495298', 'features',
+ 'feature.len()')).to eq(0)
+ # 'num_ref' key doesn't exist for wikidata features
+ expect(subject.dig('144495298', 'features').key?('num_ref')).to eq(false)
+ expect(subject.dig('144495298', 'deleted')).to eq(false)
+ expect(subject.dig('144495298', 'prediction')).to eq('E')
end
it 'returns completed scores if there is an error hitting LiftWingApi' do
@@ -119,7 +132,10 @@
end
context 'when the wiki is available only for reference-counter API' do
- before { stub_wiki_validation }
+ before do
+ stub_wiki_validation
+ stub_revision_score_reference_counter_reponse
+ end
let(:wiki) { create(:wiki, project: 'wikipedia', language: 'es') }
let(:handler) { described_class.new(wiki:) }
@@ -127,13 +143,11 @@
describe '#get_revision_data' do
it 'returns completed scores if retrieves data without errors' do
- VCR.use_cassette 'revision_score_api_handler/es_wikipedia' do
- expect(subject).to be_a(Hash)
- expect(subject.dig('157412237')).to eq({ 'wp10' => nil,
- 'features' => { 'num_ref' => 111 }, 'deleted' => false, 'prediction' => nil })
- expect(subject.dig('157417768')).to eq({ 'wp10' => nil,
- 'features' => { 'num_ref' => 42 }, 'deleted' => false, 'prediction' => nil })
- end
+ expect(subject).to be_a(Hash)
+ expect(subject.dig('157412237')).to eq({ 'wp10' => nil,
+ 'features' => { 'num_ref' => 111 }, 'deleted' => false, 'prediction' => nil })
+ expect(subject.dig('157417768')).to eq({ 'wp10' => nil,
+ 'features' => { 'num_ref' => 42 }, 'deleted' => false, 'prediction' => nil })
end
it 'returns completed scores if there is an error hitting reference-counter api' do
diff --git a/spec/lib/wiki_api_spec.rb b/spec/lib/wiki_api_spec.rb
index 73ac618f1a..d98e0f40b5 100644
--- a/spec/lib/wiki_api_spec.rb
+++ b/spec/lib/wiki_api_spec.rb
@@ -6,33 +6,45 @@
class UnexpectedError < StandardError; end
describe WikiApi do
- describe 'error handling and calls ApiErrorHandling method' do
+ describe 'handles errors by calling ApiErrorHandling method and raising a PageFetchError' do
let(:subject) { described_class.new.get_page_content('Ragesoss') }
it 'handles mediawiki 503 errors gracefully' do
stub_wikipedia_503_error
- expect(subject).to eq(nil)
+ expect { subject }.to raise_error(
+ WikiApi::PageFetchError,
+ /Failed to fetch content for Ragesoss with response status: 503/
+ )
end
it 'handles timeout errors gracefully' do
allow_any_instance_of(MediawikiApi::Client).to receive(:send)
.and_raise(Faraday::TimeoutError)
expect_any_instance_of(described_class).to receive(:log_error).once
- expect(subject).to eq(nil)
+ expect { subject }.to raise_error(
+ WikiApi::PageFetchError,
+ /Failed to fetch content for Ragesoss with response status: nil/
+ )
end
it 'handles API errors gracefully' do
allow_any_instance_of(MediawikiApi::Client).to receive(:send)
.and_raise(MediawikiApi::ApiError)
expect_any_instance_of(described_class).to receive(:log_error).once
- expect(subject).to eq(nil)
+ expect { subject }.to raise_error(
+ WikiApi::PageFetchError,
+ /Failed to fetch content for Ragesoss with response status: nil/
+ )
end
it 'handles HTTP errors gracefully' do
allow_any_instance_of(MediawikiApi::Client).to receive(:send)
.and_raise(MediawikiApi::HttpError, '')
expect_any_instance_of(described_class).to receive(:log_error).once
- expect(subject).to eq(nil)
+ expect { subject }.to raise_error(
+ WikiApi::PageFetchError,
+ /Failed to fetch content for Ragesoss with response status: nil/
+ )
end
end
@@ -169,6 +181,18 @@ class UnexpectedError < StandardError; end
end
end
+ describe '#get_user_info' do
+ let(:wiki) { Wiki.new(language: 'en', project: 'wikipedia') }
+
+ context 'when mediawiki query returns nil' do
+ it 'returns early without raising an error' do
+ allow_any_instance_of(described_class).to receive(:mediawiki).and_return(nil)
+ expect { described_class.new.get_user_info('Ragesoss') }.not_to raise_error
+ expect(described_class.new.get_user_info('Ragesoss')).to be_nil
+ end
+ end
+ end
+
describe '#redirect?' do
let(:wiki) { Wiki.new(language: 'en', project: 'wikipedia') }
let(:subject) { described_class.new(wiki).redirect?(title) }
diff --git a/spec/mailers/previews/enrollment_reminder_mailer_preview.rb b/spec/mailers/previews/enrollment_reminder_mailer_preview.rb
new file mode 100644
index 0000000000..1df2e243aa
--- /dev/null
+++ b/spec/mailers/previews/enrollment_reminder_mailer_preview.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class EnrollmentReminderMailerPreview < ActionMailer::Preview
+ def enrollment_reminder_email
+ EnrollmentReminderMailer.email(example_user)
+ end
+
+ private
+
+ def example_user
+ User.new(email: 'sage@example.com', username: 'Ragesoss')
+ end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a89ea159a5..affd03f515 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -24,6 +24,15 @@
Rails.cache.clear
Capybara::Screenshot.prune_strategy = :keep_last_run
+Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
+ file_name = example.file_path.split('/').last.gsub('.rb', '')
+ formatted_description = example.description
+ .tr(' ', '-')
+ .gsub(%r{^.*/spec/}, '')
+ .gsub(/["*:<>|?\\\r\n]/, '')
+ "screenshot_#{file_name}_description_#{formatted_description}"
+end
+
Capybara.save_path = 'tmp/screenshots/'
Capybara.server = :puma, { Silent: true }
Capybara.default_max_wait_time = 10
@@ -98,7 +107,6 @@
# them.
# Instead, we clear and print any after-success error
# logs in the `before` block above.
- Capybara::Screenshot.screenshot_and_save_page if example.exception
errors = page.driver.browser.logs.get(:browser)
# pass `js_error_expected: true` to skip JS error checking
diff --git a/spec/services/system_metrics_spec.rb b/spec/services/system_metrics_spec.rb
new file mode 100644
index 0000000000..95332fec30
--- /dev/null
+++ b/spec/services/system_metrics_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe SystemMetrics do
+ let(:service) { described_class.new }
+
+ describe '#initialize' do
+ it 'initializes with valid Sidekiq queue data' do
+ queues = YAML.load_file('config/sidekiq.yml')[:queues].reject { |q| q == 'very_long_update' }
+ expect(service.instance_variable_get(:@queues)).to eq(queues)
+ end
+ end
+
+ describe '#fetch_sidekiq_stats' do
+ it 'returns Sidekiq stats with enqueued and active jobs' do
+ stats = service.fetch_sidekiq_stats
+ expect(stats).to be_a(Hash)
+ expect(stats).to include(:enqueued_jobs, :active_jobs)
+ end
+ end
+
+ describe '#fetch_queue_management_metrics' do
+ it 'returns queue metrics with valid data' do
+ metrics = service.fetch_queue_management_metrics
+ expect(metrics).to be_a(Hash)
+ expect(metrics).to include(:queues, :paused_queues, :all_operational)
+
+ metrics[:queues].each do |queue|
+ expect(queue).to include(:name, :size, :status, :latency)
+ expect(queue[:latency]).to be_a(String)
+ end
+ end
+
+ it 'identifies paused queues correctly' do
+ allow_any_instance_of(Sidekiq::Queue).to receive(:paused?).and_return(true)
+ metrics = service.fetch_queue_management_metrics
+ expect(metrics[:paused_queues]).not_to be_empty
+ expect(metrics[:all_operational]).to eq(false)
+ end
+ end
+
+ describe '#get_queue_data' do
+ it 'returns data for a single queue' do
+ queue_name = service.instance_variable_get(:@queues).first
+ queue = Sidekiq::Queue.new(queue_name)
+ queue_data = service.get_queue_data(queue)
+
+ expect(queue_data).to be_a(Hash)
+ expect(queue_data).to include(:name, :size, :status, :latency)
+ end
+ end
+
+ describe '#get_queue_status' do
+ it 'returns Normal for queues under threshold latency' do
+ expect(service.get_queue_status('short_update', 1.hour)).to eq('Normal')
+ expect(service.get_queue_status('medium_update', 6.hours)).to eq('Normal')
+ expect(service.get_queue_status('long_update', 12.hours)).to eq('Normal')
+ expect(service.get_queue_status('daily_update', 12.hours)).to eq('Normal')
+ expect(service.get_queue_status('constant_update', 12.minutes)).to eq('Normal')
+ expect(service.get_queue_status('default', 0)).to eq('Normal')
+ end
+
+ it 'returns Backlogged for queues exceeding threshold latency' do
+ expect(service.get_queue_status('short_update', 3.hours)).to eq('Backlogged')
+ expect(service.get_queue_status('medium_update', 13.hours)).to eq('Backlogged')
+ expect(service.get_queue_status('long_update', 26.hours)).to eq('Backlogged')
+ expect(service.get_queue_status('daily_update', 26.hours)).to eq('Backlogged')
+ expect(service.get_queue_status('constant_update', 16.minutes)).to eq('Backlogged')
+ expect(service.get_queue_status('default', 2)).to eq('Backlogged')
+ end
+ end
+
+ describe '#convert_latency' do
+ it 'converts latency in seconds to more readable formats' do
+ expect(service.convert_latency(30)).to eq('30 seconds')
+ expect(service.convert_latency(90)).to eq('1 minute 30 seconds')
+ expect(service.convert_latency(3600)).to eq('1 hour')
+ expect(service.convert_latency(90000)).to eq('1 day 1 hour')
+ end
+ end
+
+ describe '#format_time' do
+ it 'formats time into main and sub-units' do
+ formatted_time = service.format_time(3661, 3600, 'hour', 'minute')
+ expect(formatted_time).to eq('1 hour 1 minute')
+ end
+ end
+end
diff --git a/spec/services/update_course_stats_spec.rb b/spec/services/update_course_stats_spec.rb
index 361c74ecff..aa09fd3d6c 100644
--- a/spec/services/update_course_stats_spec.rb
+++ b/spec/services/update_course_stats_spec.rb
@@ -1,5 +1,4 @@
# frozen_string_literal: true
-
require 'rails_helper'
describe UpdateCourseStats do
@@ -81,13 +80,18 @@
it 'tracks update errors properly in Replica' do
allow(Sentry).to receive(:capture_exception)
+ # Stub the constant RETRY_COUNT for this test to ensure retries are controlled
+ stub_const('LiftWingApi::RETRY_COUNT', 1)
+
# Raising errors only in Replica
stub_request(:any, %r{https://replica-revision-tools.wmcloud.org/.*}).to_raise(Errno::ECONNREFUSED)
VCR.use_cassette 'course_update/replica' do
subject
end
sentry_tag_uuid = subject.sentry_tag_uuid
- expect(course.flags['update_logs'][1]['error_count']).to eq 1
+ expected_error_count = subject.error_count
+
+ expect(course.flags['update_logs'][1]['error_count']).to eq expected_error_count
expect(course.flags['update_logs'][1]['sentry_tag_uuid']).to eq sentry_tag_uuid
# Checking whether Sentry receives correct error and tags as arguments
@@ -100,18 +104,20 @@
it 'tracks update errors properly in LiftWing' do
allow(Sentry).to receive(:capture_exception)
+ stub_const('LiftWingApi::RETRY_COUNT', 1)
# Raising errors only in LiftWing
stub_request(:any, %r{https://api.wikimedia.org/service/lw.*}).to_raise(Faraday::ConnectionFailed)
VCR.use_cassette 'course_update/lift_wing_api' do
subject
end
sentry_tag_uuid = subject.sentry_tag_uuid
- expect(course.flags['update_logs'][1]['error_count']).to eq 8
+ expected_error_count = subject.error_count
+ expect(course.flags['update_logs'][1]['error_count']).to eq expected_error_count
expect(course.flags['update_logs'][1]['sentry_tag_uuid']).to eq sentry_tag_uuid
# Checking whether Sentry receives correct error and tags as arguments
expect(Sentry).to have_received(:capture_exception)
- .exactly(8).times.with(Faraday::ConnectionFailed, anything)
+ .exactly(expected_error_count).times.with(Faraday::ConnectionFailed, anything)
expect(Sentry).to have_received(:capture_exception)
.exactly(8).times.with anything, hash_including(tags: { update_service_id: sentry_tag_uuid,
course: course.slug })
diff --git a/spec/support/request_helpers.rb b/spec/support/request_helpers.rb
index 347b81e874..56e9d54859 100644
--- a/spec/support/request_helpers.rb
+++ b/spec/support/request_helpers.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true
+require 'json' # Ensure JSON is required for to_json
#= Stubs for various requests
module RequestHelpers
@@ -561,4 +562,159 @@ def stub_course
stub_timeline
stub_users
end
+
+ def stub_lift_wing_response
+ request_body = {
+ 'wikidatawiki' => {
+ 'models' => {
+ 'itemquality' => {
+ 'version' => '0.5.0'
+ }
+ },
+ 'scores' => {
+ '829840084' => {
+ 'itemquality' => {
+ 'score' => {
+ 'prediction' => 'D',
+ 'probability' => { 'A' => 0.001863543366261331, 'B' => 0.001863543366261331 }
+ },
+ 'features' => {
+ 'feature.len()' => 3.0,
+ 'feature.len()' => 3.0,
+ 'feature.len()' => 0.0
+ }
+ }
+ },
+ '829840085' => {
+ 'itemquality' => {
+ 'score' => {
+ 'prediction' => 'D',
+ 'probability' => { 'A' => 0.005396336449201622, 'B' => 0.005396336449201622 }
+ },
+ 'features' => {
+ 'feature.len()' => 10.0,
+ 'feature.len()' => 9.0,
+ 'feature.len()' => 1.0
+ }
+ }
+ }
+ }
+ }
+ }
+ stub_request(:post, 'https://api.wikimedia.org/service/lw/inference/v1/models/wikidatawiki-itemquality:predict')
+ .with(
+ body: hash_including(extended_output: true),
+ headers: { 'Content-Type': 'application/json' }
+ ).to_return(
+ status: 200,
+ body: request_body.to_json
+ )
+ end
+
+ def stub_reference_counter_response
+ # Define the response body in a hash with revision IDs as keys
+ request_body = {
+ '5006940' => { 'num_ref' => 10, 'lang' => 'es', 'project' => 'wiktionary',
+ 'revid' => 5006940 },
+ '5006942' => { 'num_ref' => 4, 'lang' => 'es', 'project' => 'wiktionary',
+ 'revid' => 5006942 },
+ '5006946' => { 'num_ref' => 2, 'lang' => 'es', 'project' => 'wiktionary', 'revid' => 5006946 }
+ }
+
+ # Stub the request to match the revision ID in the URL
+ stub_request(:get, %r{https://reference-counter.toolforge.org/api/v1/references/wiktionary/es/\d+})
+ .to_return(
+ status: 200,
+ body: lambda do |request|
+ # Extract revision ID from the URL
+ rev_id = request.uri.path.split('/').last
+ # Return the appropriate response based on the revision ID
+ { 'num_ref' => request_body[rev_id.to_s]['num_ref'] }.to_json
+ end,
+ headers: { 'Content-Type' => 'application/json' }
+ )
+ end
+
+ def stub_revision_score_lift_wing_reponse
+ request_body =
+ {
+ 'wikidatawiki' => {
+ 'models' => {
+ 'itemquality' => {
+ 'version' => '0.5.0'
+ }
+ },
+ 'scores' => {
+ '144495297' => {
+ 'itemquality' => {
+ 'score' => {
+ 'prediction' => 'D',
+ 'probability' => {
+ 'A' => 0.004943068308984735,
+ 'B' => 0.004943068308984735
+ }
+ },
+ 'features' => {
+ 'feature.len()' => 3.0,
+ 'feature.len()' => 3.0,
+ 'feature.len()' => 2.0,
+ 'feature.len()' => 2.0
+ }
+ }
+ },
+ '144495298' => {
+ 'itemquality' => {
+ 'score' => {
+ 'prediction' => 'E',
+ 'probability' => {
+ 'A' => 0.0006501008909422321,
+ 'B' => 0.000887054617313177
+ }
+ },
+ 'features' => {
+ 'feature.len()' => 1.0,
+ 'feature.len()' => 1.0,
+ 'feature.len()' => 0.0,
+ 'feature.len()' => 0.0
+ }
+ }
+ }
+ }
+ }
+ }
+ stub_request(:post, 'https://api.wikimedia.org/service/lw/inference/v1/models/wikidatawiki-itemquality:predict')
+ .with(
+ body: hash_including(extended_output: true),
+ headers: { 'Content-Type': 'application/json' }
+ ).to_return(
+ status: 200,
+ body: request_body.to_json
+ )
+ end
+
+ def stub_revision_score_reference_counter_reponse
+ request_body = {
+ '157412237' => { 'num_ref' => 111, 'lang' => 'es', 'project' => 'wikipedia',
+ 'revid' => 157412237 },
+ '157417768' => { 'num_ref' => 42, 'lang' => 'es', 'project' => 'wikipedia',
+ 'revid' => 157417768 },
+ '829840090' => { 'num_ref' => 132, 'lang' => 'es', 'project' => 'wikipedia',
+ 'revid' => 829840090 },
+ '829840091' => { 'num_ref' => 1, 'lang' => 'es', 'project' => 'wikipedia',
+ 'revid' => 829840091 }
+ }
+
+ # Stub the request to match the revision ID in the URL
+ stub_request(:get, %r{https://reference-counter.toolforge.org/api/v1/references/wikipedia/es/\d+})
+ .to_return(
+ status: 200,
+ body: lambda do |request|
+ # Extract revision ID from the URL
+ rev_id = request.uri.path.split('/').last
+ # Return the appropriate response based on the revision ID
+ { 'num_ref' => request_body[rev_id.to_s]['num_ref'] }.to_json
+ end,
+ headers: { 'Content-Type' => 'application/json' }
+ )
+ end
end
diff --git a/test/reducers/notifications.spec.js b/test/reducers/notifications.spec.js
new file mode 100644
index 0000000000..48768ce83d
--- /dev/null
+++ b/test/reducers/notifications.spec.js
@@ -0,0 +1,241 @@
+import deepFreeze from 'deep-freeze';
+import notifications from '../../app/assets/javascripts/reducers/notifications';
+import { ADD_NOTIFICATION, REMOVE_NOTIFICATION, API_FAIL, SAVE_TIMELINE_FAIL } from '../../app/assets/javascripts/constants';
+
+describe('notifications reducer', () => {
+ let errorNotification1;
+ let errorNotification2;
+ let errorNotification3;
+ let successNotification1;
+ beforeEach(() => {
+ errorNotification1 = {
+ type: 'error',
+ message: 'Notification 1'
+ };
+ errorNotification2 = {
+ type: 'error',
+ message: 'Notification 2'
+ };
+ errorNotification3 = {
+ type: 'error',
+ message: 'Notification 3'
+ };
+ successNotification1 = {
+ type: 'success',
+ message: 'Notification 1'
+ };
+ });
+
+ it('should return the initial state', () => {
+ expect(notifications(undefined, {})).toEqual([]);
+ });
+
+ it('should handle ADD_NOTIFICATION when notifications < max', () => {
+ const initialState = [errorNotification1, errorNotification2, errorNotification3];
+ const action = {
+ type: ADD_NOTIFICATION,
+ notification: successNotification1
+ };
+ const expectedState = [...initialState, successNotification1];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle ADD_NOTIFICATION when notifications == max', () => {
+ const initialState = [errorNotification2, errorNotification1, errorNotification3];
+ const errorNotification4 = {
+ type: 'error',
+ message: 'Notification 4'
+ };
+ const action = {
+ type: ADD_NOTIFICATION,
+ notification: errorNotification4
+ };
+ const expectedState = [errorNotification1, errorNotification3, errorNotification4];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle REMOVE_NOTIFICATION', () => {
+ const expectedState = [errorNotification1, successNotification1, errorNotification3];
+ const initialState = [...expectedState, errorNotification2];
+ const action = {
+ type: REMOVE_NOTIFICATION,
+ notification: errorNotification2
+ };
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle API_FAIL for readyState 0', () => {
+ const initialState = [errorNotification2, successNotification1];
+ const action = {
+ type: API_FAIL,
+ data: {
+ readyState: 0
+ }
+ };
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(initialState);
+ });
+
+ it('should handle API_FAIL for silent action', () => {
+ const initialState = [errorNotification2, successNotification1];
+ const action = {
+ type: API_FAIL,
+ silent: true,
+ data: {
+ errors: 'Example notification error message'
+ }
+ };
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(initialState);
+ });
+
+ it('should handle API_FAIL for already saved notification', () => {
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: 'Example notification status'
+ };
+ const initialState = [notification];
+ const action = {
+ type: API_FAIL,
+ data: {
+ statusText: 'Example notification status'
+ }
+ };
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(initialState);
+ });
+
+ it('should handle API_FAIL for action with valid data.responseText', () => {
+ const initialState = [];
+ const action = {
+ type: API_FAIL,
+ data: {
+ responseText: '{"message": "Example notification status"}'
+ }
+ };
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: 'Example notification status'
+ };
+ const expectedState = [notification];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle API_FAIL for action with invalid data.responseText', () => {
+ const initialState = [];
+ const action = {
+ type: API_FAIL,
+ data: {
+ responseText: '{"message":"Example notification status"'
+ }
+ };
+ // when data.responseText is invalid, notification.message is assigned
+ // the data object as the last fallback. This is however serialized into
+ // a string as React cannot render objects.
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: '{"responseText":"{\\"message\\":\\"Example notification status\\""}',
+ };
+ const expectedState = [notification];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle API_FAIL for action with data.responseJSON.error', () => {
+ const initialState = [];
+ const action = {
+ type: API_FAIL,
+ data: {
+ responseJSON: {
+ error: 'Example notification status'
+ }
+ }
+ };
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: 'Example notification status'
+ };
+ const expectedState = [notification];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle API_FAIL for action with failed JSONP request', () => {
+ const initialState = [];
+ const action = {
+ type: API_FAIL,
+ data: {
+ message: 'JSONP request failed'
+ }
+ };
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: I18n.t('customize_error_message.JSONP_request_failed')
+ };
+ const expectedState = [notification];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle API_FAIL for action with empty data', () => {
+ const initialState = [];
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: ''
+ };
+ const action = {
+ type: API_FAIL,
+ data: ''
+ };
+ const expectedState = [notification];
+ const errorSpy = jest.spyOn(console, 'error');
+ const logSpy = jest.spyOn(console, 'log');
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ expect(errorSpy).toHaveBeenCalledWith('Error: ', '');
+ expect(logSpy).toHaveBeenCalledWith('');
+ });
+
+ it('should handle SAVE_TIMELINE_FAIL', () => {
+ const initialState = [errorNotification2, successNotification1];
+ deepFreeze(initialState);
+ const action = {
+ type: SAVE_TIMELINE_FAIL,
+ data: {},
+ courseSlug: {}
+ };
+ const notification = {
+ closable: true,
+ type: 'error',
+ message: 'The changes you just submitted were not saved. '
+ + 'This may happen if the timeline has been changed — '
+ + 'by someone else, or by you in another browser '
+ + 'window — since the page was loaded. The latest '
+ + 'course data has been reloaded, and is ready for '
+ + 'you to edit further.'
+ };
+ const expectedState = [...initialState, notification];
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(expectedState);
+ });
+
+ it('should handle unknown action type', () => {
+ const initialState = [errorNotification2, successNotification1];
+ deepFreeze(initialState);
+ const action = {
+ type: 'UNKNOWN_ACTION'
+ };
+ deepFreeze(initialState);
+ expect(notifications(initialState, action)).toEqual(initialState);
+ });
+});
diff --git a/training_content/wiki_ed/slides/60-keeping-track-of-your-work/6003-stage-1-bibliography.yml b/training_content/wiki_ed/slides/60-keeping-track-of-your-work/6003-stage-1-bibliography.yml
index d2a8633f9a..4bcc294ae9 100644
--- a/training_content/wiki_ed/slides/60-keeping-track-of-your-work/6003-stage-1-bibliography.yml
+++ b/training_content/wiki_ed/slides/60-keeping-track-of-your-work/6003-stage-1-bibliography.yml
@@ -4,7 +4,7 @@ summary:
content: |
-
You can see the details for each stage of the article development process by clicking the bar
at the bottom of the article listing. For the first stage, compiling your set of sources,
diff --git a/training_content/wiki_ed/slides/65-keeping-track-of-work-without-sandboxes/6503-stage-1-bibliography-no-sandbox.yml b/training_content/wiki_ed/slides/65-keeping-track-of-work-without-sandboxes/6503-stage-1-bibliography-no-sandbox.yml
index 3f5357a413..51ba25a98b 100644
--- a/training_content/wiki_ed/slides/65-keeping-track-of-work-without-sandboxes/6503-stage-1-bibliography-no-sandbox.yml
+++ b/training_content/wiki_ed/slides/65-keeping-track-of-work-without-sandboxes/6503-stage-1-bibliography-no-sandbox.yml
@@ -4,7 +4,7 @@ summary:
content: |
-
You can see the details for each stage of the article development process by clicking the bar
at the bottom of the article listing. For the first stage, compiling your set of sources,
diff --git a/update_hosts.sh b/update_hosts.sh
new file mode 100644
index 0000000000..18cad09897
--- /dev/null
+++ b/update_hosts.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Get the MySQL container ID
+MYSQL_CONTAINER_ID=$(docker ps --format '{{.ID}} {{.Names}}' | grep 'wikiedudashboard-mysql-1' | awk '{print $1}')
+
+echo $MYSQL_CONTAINER_ID
+
+# Fetch the IP address of the MySQL container
+MYSQL_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$MYSQL_CONTAINER_ID")
+
+# Check if we successfully fetched the IP address
+if [ -z "$MYSQL_IP" ]; then
+ echo "Failed to retrieve the MySQL container IP address. Please ensure the Docker containers are running by executing 'docker compose up -d'."
+ if grep -q "$MYSQL_IP mysql" /etc/hosts; then
+ sudo sed -i '/[[:space:]]mysql$/d' /etc/hosts
+ echo "MySQL entry removed from /etc/hosts."
+ fi
+
+ exit 1
+fi
+
+# Print the IP address
+echo "MySQL IP address: $MYSQL_IP"
+
+# Backup /etc/hosts file
+sudo cp /etc/hosts /etc/hosts.bak
+
+# Add MySQL container IP to /etc/hosts
+if grep -q "$MYSQL_IP mysql" /etc/hosts; then
+ echo "MySQL entry already exists in /etc/hosts."
+ # Remove existing MySQL entry from /etc/hosts (if it exists)
+ sudo sed -i '/[[:space:]]mysql$/d' /etc/hosts
+ echo "Removed old MySQL entry from /etc/hosts."
+fi
+
+# Add new MySQL container IP address to /etc/hosts
+echo "Adding MySQL container IP address to /etc/hosts"
+echo "$MYSQL_IP mysql" | sudo tee -a /etc/hosts > /dev/null
+
+# Print success message
+echo "MySQL IP address has been added to /etc/hosts."
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 899bd04e7b..9bedc7f5f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2817,6 +2817,7 @@ __metadata:
eslint-webpack-plugin: ^3.1.1
fetch-jsonp: ^1.2.1
i18n-js: ^4.2.2
+ immer: ^10.1.1
jeet: ^7.2.0
jest: ^26.0.1
jquery: ^3.5.1
@@ -6866,7 +6867,7 @@ __metadata:
languageName: node
linkType: hard
-"immer@npm:^10.0.3":
+"immer@npm:^10.0.3, immer@npm:^10.1.1":
version: 10.1.1
resolution: "immer@npm:10.1.1"
checksum: 07c67970b7d22aded73607193d84861bf786f07d47f7d7c98bb10016c7a88f6654ad78ae1e220b3c623695b133aabbf24f5eb8d9e8060cff11e89ccd81c9c10b
+
- -
-
+
+
+
+ );
- return (
- +
+
- );
+ {I18n.t('wizard.assignment_description')}
+
+
+
+
+ #{slide.title}
" << + PandocRuby.convert(slide.content, from: :markdown_github, to: :html) << + "
" + end + + output = '' + +TrainingModule.all.each do |tm| + output += "---
Training Module ##{tm.id}: #{tm.name}
---" + output += "\n
#{tm.description}
" + tm.slides.each do |slide| + output += html_from_slide(slide) + end +end + +File.open('training_content.html', 'wb') { |file| file.write(output) } + +# The pandoc conversion fails if a local asset file from the html does not exist. +# As of January 2025, the only case of this is the inline icon in slide 334-authorship-highlighting.yml +# Edit the html file to turn it into an absolute path — https://dashboard.wikiedu.org/assets/images/article-viewer.svg +# then proceed with the conversion. + +`pandoc training_content.html --to docx --output trainings.docx` \ No newline at end of file diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 05b3201769..e333688461 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -43,7 +43,7 @@ Your system has cmdtest installed, which provides a different program as yarn. U - **To check if redis is running as a daemon in Linux** `ps aux | grep redis-server` -- Use node v10 or lower to avoid any errors. +- Use node v14 or newer to avoid any errors. - **For WSL users , if rspec tests are taking too long to run** make sure to fork the repo in the linux file system and not in the windows partition. Use command `pwd` to know the exact path of your repo. If the path starts with `/mnt/`, the repo is in windows partition. Follow the documentation available at link: https://learn.microsoft.com/en-us/windows/wsl/filesystems to know more about storing and moving files in the linux file system. If you have received error related to dependencies(`sudo apt-get install -y redis-server mariadb-server libmariadb-dev rvm nodejs npm pandoc`), try to install packages one by one and figure out which packages are creating problems. diff --git a/fixtures/vcr_cassettes/cached/assigned_articles_view.yml b/fixtures/vcr_cassettes/cached/assigned_articles_view.yml new file mode 100644 index 0000000000..c869051cfa --- /dev/null +++ b/fixtures/vcr_cassettes/cached/assigned_articles_view.yml @@ -0,0 +1,133 @@ +--- +http_interactions: +- request: + method: get + uri: https://en.wikipedia.org/w/api.php?action=query&format=json&prop=revisions&rvprop=ids&titles=Nancy%20Tuana + body: + encoding: US-ASCII + string: '' + headers: + User-Agent: + - Faraday v1.10.2 + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + Accept: + - "*/*" + response: + status: + code: 200 + message: OK + headers: + Date: + - Tue, 28 Jan 2025 18:55:00 GMT + Server: + - mw-api-ext.eqiad.main-5f7d7bfc55-psxcn + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - DENY + Content-Disposition: + - inline; filename=api-result.json + Vary: + - Accept-Encoding,Treat-as-Untrusted,X-Forwarded-Proto,Cookie,Authorization + Cache-Control: + - private, must-revalidate, max-age=0 + Content-Type: + - application/json; charset=utf-8 + Age: + - '0' + X-Cache: + - cp6014 miss, cp6011 pass + X-Cache-Status: + - pass + Server-Timing: + - cache;desc="pass", host;desc="cp6011" + Strict-Transport-Security: + - max-age=106384710; includeSubDomains; preload + Report-To: + - '{ "group": "wm_nel", "max_age": 604800, "endpoints": [{ "url": "https://intake-logging.wikimedia.org/v1/events?stream=w3c.reportingapi.network_error&schema_uri=/w3c/reportingapi/network_error/1.0.0" + }] }' + Nel: + - '{ "report_to": "wm_nel", "max_age": 604800, "failure_fraction": 0.05, "success_fraction": + 0.0}' + Set-Cookie: + - GeoIP=CM:::6.00:12.50:v4; Path=/; secure; Domain=.wikipedia.org + - NetworkProbeLimit=0.001;Path=/;Secure;SameSite=Lax;Max-Age=3600 + - WMF-Last-Access-Global=28-Jan-2025;Path=/;Domain=.wikipedia.org;HttpOnly;secure;Expires=Sat, + 01 Mar 2025 12:00:00 GMT + - WMF-Last-Access=28-Jan-2025;Path=/;HttpOnly;secure;Expires=Sat, 01 Mar 2025 + 12:00:00 GMT + X-Client-Ip: + - 102.244.157.204 + Accept-Ranges: + - bytes + Content-Length: + - '144' + body: + encoding: ASCII-8BIT + string: '{"batchcomplete":"","query":{"pages":{"51910526":{"pageid":51910526,"ns":0,"title":"Nancy + Tuana","revisions":[{"revid":1220423548,"parentid":1180607625}]}}}}' + recorded_at: Tue, 28 Jan 2025 18:55:00 GMT +- request: + method: post + uri: https://api.wikimedia.org/service/lw/inference/v1/models/enwiki-articlequality:predict + body: + encoding: UTF-8 + string: '{"rev_id":1220423548,"extended_output":true}' + headers: + Content-Type: + - application/json + User-Agent: + - Faraday v1.10.2 + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + Accept: + - "*/*" + response: + status: + code: 200 + message: OK + headers: + Content-Type: + - application/json + Date: + - Tue, 28 Jan 2025 18:55:00 GMT + Server: + - envoy + Cache-Control: + - no-cache + X-Ratelimit-Limit: + - 50000, 50000;w=3600 + X-Ratelimit-Remaining: + - '49994' + X-Ratelimit-Reset: + - '299' + Vary: + - Accept-Encoding + Age: + - '1' + X-Cache: + - cp6014 miss, cp6011 pass + X-Cache-Status: + - pass + Server-Timing: + - cache;desc="pass", host;desc="cp6011" + Strict-Transport-Security: + - max-age=106384710; includeSubDomains; preload + Report-To: + - '{ "group": "wm_nel", "max_age": 604800, "endpoints": [{ "url": "https://intake-logging.wikimedia.org/v1/events?stream=w3c.reportingapi.network_error&schema_uri=/w3c/reportingapi/network_error/1.0.0" + }] }' + Nel: + - '{ "report_to": "wm_nel", "max_age": 604800, "failure_fraction": 0.05, "success_fraction": + 0.0}' + X-Client-Ip: + - 102.244.157.204 + Accept-Ranges: + - bytes + Transfer-Encoding: + - chunked + body: + encoding: ASCII-8BIT + string: '{"enwiki":{"models":{"articlequality":{"version":"0.9.2"}},"scores":{"1220423548":{"articlequality":{"score":{"prediction":"Start","probability":{"B":0.0967005597473408,"C":0.33396017760551916,"FA":0.00454057782408097,"GA":0.012108337779692136,"Start":0.5182220232989376,"Stub":0.03446832374442916}},"features":{"feature.wikitext.revision.chars":6782.0,"feature.wikitext.revision.content_chars":3161.0,"feature.wikitext.revision.ref_tags":5.0,"feature.wikitext.revision.wikilinks":17.0,"feature.wikitext.revision.external_links":12.0,"feature.wikitext.revision.headings_by_level(2)":3.0,"feature.wikitext.revision.headings_by_level(3)":0.0,"feature.wikitext.revision.list_items":8.0,"feature.enwiki.revision.image_links":0.0,"feature.enwiki.revision.image_template":0.0,"feature.enwiki.revision.images_in_templates":0,"feature.enwiki.revision.images_in_tags":0,"feature.enwiki.infobox_images":0,"feature.enwiki.revision.category_links":8.0,"feature.enwiki.revision.shortened_footnote_templates":0.0,"feature.enwiki.revision.cite_templates":12.0,"feature.wikitext.revision.templates":19.0,"feature.enwiki.revision.infobox_templates":1.0,"feature.enwiki.revision.cn_templates":0.0,"feature.enwiki.revision.who_templates":0.0,"feature.enwiki.main_article_templates":0.0,"feature.english.stemmed.revision.stems_length":3928,"feature.enwiki.revision.paragraphs_without_refs_total_length":3674.0,"feature.len(
-
-