From 9c41e803f577e9129b049f3789018a296bde994a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:32:26 -0400 Subject: [PATCH 1/4] build(deps): bump fugit from 1.9.0 to 1.11.1 (#7183) Bumps [fugit](https://github.com/floraison/fugit) from 1.9.0 to 1.11.1. - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.9.0...v1.11.1) --- updated-dependencies: - dependency-name: fugit dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59a9f66a1b..69cab7d09f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM combine_pdf (1.0.26) matrix ruby-rc4 (>= 0.1.5) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) config (5.5.1) deep_merge (~> 1.2, >= 1.2.1) connection_pool (2.4.1) @@ -183,7 +183,7 @@ GEM dry-schema (>= 1.12, < 2) zeitwerk (~> 2.6) erubi (1.13.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo exception_notification (4.5.0) actionmailer (>= 5.2, < 8) @@ -197,8 +197,8 @@ GEM faker (3.4.2) i18n (>= 1.8.11, < 2) ffi (1.16.3) - fugit (1.9.0) - et-orbi (~> 1, >= 1.2.7) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuubar (2.5.1) rspec-core (~> 3.0) From 2c8b56284c4961e0796158f12189db90ffc4dff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:03:21 -0400 Subject: [PATCH 2/4] build(deps-dev): bump rexml from 3.3.4 to 3.3.6 (#7186) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.4 to 3.3.6. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.4...v3.3.6) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 69cab7d09f..af1e64f195 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,7 +380,7 @@ GEM redis (>= 3.3) resque (>= 1.27) rufus-scheduler (~> 3.2, != 3.3) - rexml (3.3.4) + rexml (3.3.6) strscan rmagick (6.0.1) observer (~> 0.1) From 297f45ff481ff903cdc07accd16fc7ffecd130bf Mon Sep 17 00:00:00 2001 From: David Liu Date: Tue, 27 Aug 2024 14:47:15 +0000 Subject: [PATCH 3/4] Fix bug in syntax highlighting caused by incorrect function call (#7187) --- Changelog.md | 15 +++++++++++++++ .../Components/Result/text_viewer.jsx | 2 +- .../Components/__tests__/text_viewer.test.jsx | 17 ++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index f0a460272c..853e3d8a7b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,20 @@ # Changelog +## [unreleased] + +### 🚨 Breaking changes + +### ✨ New features and improvements + +### 🐛 Bug fixes + +- Fix bug in syntax highlighting caused by incorrect function call (#7187) + +### 🔧 Internal changes + +- Upgrade Docker environment to use Ruby v3.3 (#7185) +- Upgrade to Rails v7.2 (#7185) + ## [v2.5.0] ### ✨ New features and improvements diff --git a/app/assets/javascripts/Components/Result/text_viewer.jsx b/app/assets/javascripts/Components/Result/text_viewer.jsx index eadb5306a0..b3fad2514d 100644 --- a/app/assets/javascripts/Components/Result/text_viewer.jsx +++ b/app/assets/javascripts/Components/Result/text_viewer.jsx @@ -115,7 +115,7 @@ export class TextViewer extends React.PureComponent { } } if (currLine.textContent.length > 0) { - nodeLines.appendChild(currLine); + nodeLines.push(currLine); } nodeLines.push(this.raw_content.current.lastChild.cloneNode(true)); while (this.raw_content.current.firstChild) { diff --git a/app/assets/javascripts/Components/__tests__/text_viewer.test.jsx b/app/assets/javascripts/Components/__tests__/text_viewer.test.jsx index 30b1e10bca..373eae78aa 100644 --- a/app/assets/javascripts/Components/__tests__/text_viewer.test.jsx +++ b/app/assets/javascripts/Components/__tests__/text_viewer.test.jsx @@ -5,7 +5,9 @@ import {TextViewer} from "../Result/text_viewer"; describe("TextViewer", () => { let props; - beforeEach(() => { + afterEach(cleanup); + + it("should render its text content when the content ends with a new line", () => { props = { content: "def f(n: int) -> int:\n return n + 1\n", annotations: [], @@ -14,11 +16,20 @@ describe("TextViewer", () => { }; render(); + + expect(screen.getByText("def f(n: int) -> int:")).toBeInTheDocument(); }); - afterEach(cleanup); + it("should render its text content when the content doesn't end with a new line", () => { + props = { + content: "def f(n: int) -> int:\n return n + 1", + annotations: [], + focusLine: null, + submission_file_id: 1, + }; + + render(); - it("should render its text content", () => { expect(screen.getByText("def f(n: int) -> int:")).toBeInTheDocument(); }); }); From a3e27012672b0503dc63c5040ae8058a327460dc Mon Sep 17 00:00:00 2001 From: Samuel Maldonado Date: Tue, 27 Aug 2024 11:15:25 -0400 Subject: [PATCH 4/4] update changelog and markus_version --- Changelog.md | 11 +---------- app/MARKUS_VERSION | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Changelog.md b/Changelog.md index 853e3d8a7b..6f11bd52ca 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,20 +1,11 @@ # Changelog -## [unreleased] - -### 🚨 Breaking changes - -### ✨ New features and improvements +## [v2.5.1] ### 🐛 Bug fixes - Fix bug in syntax highlighting caused by incorrect function call (#7187) -### 🔧 Internal changes - -- Upgrade Docker environment to use Ruby v3.3 (#7185) -- Upgrade to Rails v7.2 (#7185) - ## [v2.5.0] ### ✨ New features and improvements diff --git a/app/MARKUS_VERSION b/app/MARKUS_VERSION index 30acdc6b3c..3c981334fc 100644 --- a/app/MARKUS_VERSION +++ b/app/MARKUS_VERSION @@ -1 +1 @@ -VERSION=v2.5.0,PATCH_LEVEL=DEV +VERSION=v2.5.1,PATCH_LEVEL=DEV