mumuki-laboratory 9.0.2 → 9.1.0

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210302181654) do
+ActiveRecord::Schema.define(version: 20210330175706) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -79,14 +79,16 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.bigint "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.index ["organization_id"], name: "index_certificate_programs_on_organization_id"
   end
 
   create_table "certificates", force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "certificate_program_id"
-    t.datetime "start_date"
-    t.datetime "end_date"
+    t.datetime "started_at"
+    t.datetime "ended_at"
     t.string "code"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -121,6 +123,8 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.integer "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "period_start"
+    t.datetime "period_end"
   end
 
   create_table "discussions", force: :cascade do |t|
@@ -199,6 +203,13 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.index ["exam_registration_id"], name: "index_exam_registrations_exams_on_exam_registration_id"
   end
 
+  create_table "exam_registrations_users", id: false, force: :cascade do |t|
+    t.bigint "exam_registration_id", null: false
+    t.bigint "user_id", null: false
+    t.index ["exam_registration_id"], name: "index_exam_registrations_users_on_exam_registration_id"
+    t.index ["user_id"], name: "index_exam_registrations_users_on_user_id"
+  end
+
   create_table "exams", id: :serial, force: :cascade do |t|
     t.integer "organization_id"
     t.integer "guide_id"
@@ -368,6 +379,13 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.integer "discussion_id"
     t.boolean "approved", default: false
     t.boolean "not_actually_a_question", default: false
+    t.datetime "approved_at"
+    t.bigint "approved_by_id"
+    t.integer "deletion_motive"
+    t.datetime "deleted_at"
+    t.bigint "deleted_by_id"
+    t.index ["approved_by_id"], name: "index_messages_on_approved_by_id"
+    t.index ["deleted_by_id"], name: "index_messages_on_deleted_by_id"
   end
 
   create_table "notifications", force: :cascade do |t|
@@ -507,6 +525,8 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.datetime "forum_terms_accepted_at"
     t.boolean "banned_from_forum"
     t.boolean "uppercase_mode"
+    t.string "delete_account_token"
+    t.datetime "delete_account_token_expiration_date"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

data/spec/features/discussion_flow_spec.rb

@@ -162,14 +162,27 @@ feature 'Discussion Flow', organization_workspace: :test do
       end
 
       context 'and forum enabled' do
-        before { Organization.current.update! forum_enabled: true }
+        let!(:problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student.uid) }
+        let!(:another_problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student.uid) }
+        before do
+          Organization.current.update! forum_enabled: true
+          another_problem_2_discussion_message.soft_delete! :inappropriate_content, moderator
+        end
 
         scenario 'newly created discussion' do
           visit current_path
           expect(page).to have_text(problem_2.name)
           expect(page).to have_text('Open')
           expect(page).to have_text('Messages')
+          expect(page).not_to have_text('Preview')
+          expect(page).to have_text(problem_2_discussion_message.content)
+          expect(page).not_to have_text(another_problem_2_discussion_message.content)
           expect(page).not_to have_xpath("//div[@class='discussion-actions']")
+          expect(page).to_not have_text('Includes inappropriate content')
+          expect(page).to_not have_text('Shares the correct solution')
+          expect(page).to_not have_text('Discloses personal information')
+          expect(page).to have_text('included inappropriate content')
+          expect(page).to_not have_text ("Deleted by #{moderator.name}")
         end
 
         context 'for moderator' do
@@ -180,11 +193,18 @@ feature 'Discussion Flow', organization_workspace: :test do
             expect(page).to have_text(problem_2.name)
             expect(page).to have_text('Open')
             expect(page).to have_text('Messages')
+            expect(page).to have_text('Preview')
+            expect(page).to have_text(problem_2_discussion_message.content)
+            expect(page).to have_text(another_problem_2_discussion_message.content)
             expect(page).to have_xpath("//div[@class='discussion-actions']")
+            expect(page).to have_text('Includes inappropriate content')
+            expect(page).to have_text('Shares the correct solution')
+            expect(page).to have_text('Discloses personal information')
+            expect(page).to have_text('included inappropriate content')
+            expect(page).to have_text ("Deleted by #{moderator.name}")
           end
         end
       end
     end
   end
-
 end

data/spec/features/exercise_flow_spec.rb

@@ -190,7 +190,7 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('need a hint?')
       expect(page).to have_selector('.upload')
       expect(problem_5.language.extension).to eq('gbs')
-      expect(page.find("//div[@class = 'form-group']/input")['accept']).to eq(".gbs")
+      expect(page.find("//input[@id = 'mu-upload-input']")['accept']).to eq(".gbs")
 
       expect(page.find("#mu-exercise-id")['value']).to eq(problem_5.id.to_s)
       expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')

data/spec/features/guide_reset_spec.rb

@@ -18,7 +18,7 @@ feature 'Guide Reset Flow', organization_workspace: :test do
 
   before { reindex_current_organization! }
 
-  let(:restart_xpath) { "//i[@title='#{I18n.t(:restart)}']" }
+  let(:restart_xpath) { "//a[@title='#{I18n.t(:restart)}']" }
 
   context 'no logged in user' do
     scenario 'visit guide' do

data/spec/features/terms_flow_spec.rb

@@ -92,8 +92,7 @@ feature 'Terms Flow', organization_workspace: :test do
       end
     end
 
-    context 'with unaccepted role terms' do
-
+    context 'with unaccepted role terms', :toast_interferes_with_view do
       context 'visit forum' do
         let(:terms_path) { '/discussions/terms' }
         before { test_organization.update! forum_enabled: true }

data/spec/features/user_activity_flow_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+feature 'User Activity Flow', organization_workspace: :test do
+  let(:user) { create(:user) }
+  before { set_current_user!(user) }
+
+  let(:fake_stats) { double('stats') }
+  before do
+    allow(UserStats).to receive(:stats_for).and_return(fake_stats)
+    allow(fake_stats).to receive(:activity).and_return(
+        { exercises: { solved_count: 8, count: 10 },
+          messages: { count: 12, approved: 6 } })
+  end
+
+  let(:week_start) { Time.new(2020, 10, 12) }
+  before do
+    allow(Time).to receive(:now).and_return(week_start)
+  end
+
+  context 'total' do
+    before { visit activity_user_path }
+
+    scenario 'displays exercises done percentage' do
+      expect(page).to have_text('80%')
+      expect(page).to have_text('done')
+    end
+
+    scenario 'displays exercises solved count' do
+      expect(page).to have_text('8')
+      expect(page).to have_text('solved')
+    end
+
+    scenario 'displays messages count' do
+      expect(page).to have_text('12')
+      expect(page).to have_text('messages')
+    end
+
+    scenario 'displays validated messages count' do
+      expect(page).to have_text('6')
+      expect(page).to have_text('validated')
+    end
+
+    scenario 'displays recent weeks' do
+      expect(page).to have_text 'Week of 2020-10-12'
+      expect(page).to have_text 'Week of 2020-10-05'
+      expect(page).to have_text 'Week of 2020-09-28'
+    end
+  end
+
+  context 'selecting a specific week' do
+    before do
+      visit activity_user_path
+      click_on 'Week of 2020-10-12'
+    end
+
+    scenario "redirects to week activity" do
+      expect(page).to have_current_path('/user/activity?date_from=2020-10-12&date_to=2020-10-19')
+    end
+
+    scenario "doesn't display exercises done percentage" do
+      expect(page).not_to have_text('80%')
+      expect(page).not_to have_text('done')
+    end
+  end
+end

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -46,7 +46,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
     end
 
     context 'in chapter' do
-      let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson]) }
+      let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson], number: 1) }
       let(:lesson) { create(:lesson, name: 'my lesson', exercises: [exercise]) }
       let(:exercise) { create(:exercise, name: 'my exercise') }
 
@@ -64,7 +64,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
       it 'mumuki, organization, chapter and lesson have links but exercise does not' do
         expect(breadcrumb).to include home_breadcrumb_with_link
         expect(breadcrumb).to include organization_breadcrumb_with_link
-        expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">my chapter</a>"
+        expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">1. my chapter</a>"
         expect(breadcrumb).to include "<a href=\"/lessons/#{lesson.id}-my-chapter-my-lesson\">1. my lesson</a>"
         expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>"
       end

data/spec/helpers/user_activity_helper_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe UserActivityHelper, organization_workspace: :test do
+  helper UserActivityHelper
+
+  let(:organization) { Organization.current }
+
+  before do
+    # Set today date to Wednesday to test week always starts on Monday
+    allow(Date).to receive(:today).and_return(Date.new(2021, 2, 10))
+    allow_any_instance_of(UserActivityHelper).to receive(:min_week).and_return(8.weeks.ago(Date.today))
+  end
+
+  describe 'activity_selector_week_range_for' do
+    let(:range) { activity_selector_week_range_for organization }
+    let(:closest_monday) { Date.new(2021, 2, 8) }
+
+    context 'organization without in preparation until' do
+      it { expect(range.length).to eq 9 }
+      it { expect(range.first).to eq [closest_monday, 1.week.since(closest_monday).to_date] }
+      it { expect(range.last).to eq [8.week.ago(closest_monday).to_date, 7.week.ago(closest_monday).to_date] }
+    end
+
+    context 'organization with in preparation until' do
+      before { organization.update! in_preparation_until: 3.week.ago(Date.today) }
+
+      it { expect(range.length).to eq 4 }
+      it { expect(range.first).to eq [closest_monday, 1.week.since(closest_monday).to_date] }
+      it { expect(range.last).to eq [3.week.ago(closest_monday).to_date, 2.week.ago(closest_monday).to_date] }
+    end
+  end
+end

data/spec/helpers/with_navigation_spec.rb

@@ -14,9 +14,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
       let!(:exercise_3) { create(:exercise, id: 13, name: 'exercise 3', guide: guide) }
 
       context 'when user did not submit any solution' do
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_1.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_1.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when on last unresolved exercise' do
@@ -25,9 +25,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           exercise_3.submit_solution!(current_user).passed!
         end
 
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
         it { expect(next_button(exercise_2)).to be nil }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when user did submit a solution' do
@@ -35,9 +35,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           exercise_1.submit_solution!(current_user).passed!
         end
 
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
     end
 
@@ -46,8 +46,8 @@ describe WithStudentPathNavigation, organization_workspace: :test do
       let!(:exercise) { create(:exercise, id: 12, name: 'exercise 2', guide: guide) }
 
       context 'when user did not submit any exercise' do
-        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-success btn-block\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{reading.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-complementary w-100\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{reading.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when user finished just reading' do
@@ -55,7 +55,7 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           reading.submit_confirmation!(current_user)
         end
 
-        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-success btn-block\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-complementary w-100\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
         it { expect(next_button(exercise)).to eq nil }
       end
     end
@@ -83,15 +83,38 @@ describe WithStudentPathNavigation, organization_workspace: :test do
         let(:lessons) { [lesson_1, lesson_2, lesson_3] }
 
         context 'one suggestion' do
-          it { expect(next_button(lesson_2)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{lesson_3.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_3.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_2)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/lessons/#{lesson_3.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_3.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
           it { expect(next_button(lesson_1)).to be_html_safe }
         end
 
         context 'many suggestions' do
-          it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{lesson_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/lessons/#{lesson_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
           it { expect(next_button(lesson_1)).to be_html_safe }
         end
       end
     end
+
+    context "when there's a next chapter" do
+      let(:organization) { create :organization, book: book }
+
+      let(:book) { create(:book, chapters: [
+        chapter_1,
+        chapter_2
+      ]) }
+
+      let(:chapter_1) { create(:chapter, lessons: [lesson_1]) }
+      let(:chapter_2) { create(:chapter, lessons: [create(:lesson, exercises: [ create(:exercise) ])]) }
+
+      let(:lesson_1) { create(:lesson, exercises: [ exercise_1 ]) }
+      let(:exercise_1) { create(:exercise) }
+
+      before do
+        organization.switch!
+        reindex_current_organization!
+        exercise_1.submit_solution!(current_user).passed!
+      end
+
+      it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/chapters/#{chapter_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{chapter_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+    end
   end
 end

data/spec/javascripts/editors-spec.js

@@ -22,7 +22,7 @@ describe('editors', () => {
   it('reads the custom sources if present, ignoring the form', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea class="form-control editor" name="solution[content]" id="solution_content">the standard solution</textarea>
       </div>
     </form>`);
@@ -39,7 +39,7 @@ describe('editors', () => {
   it('reads the form if no sources', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea class="form-control editor" name="solution[content]" id="solution_content">the solution</textarea>
       </div>
     </form>`);
@@ -49,7 +49,7 @@ describe('editors', () => {
   it('reads the form if no sources and exercise is multifile', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea
           class="form-control editor"
           data-editor-language="html"

data/spec/javascripts/kids-button-spec.js

@@ -4,7 +4,7 @@ describe('KidsButton', () => {
   fixture.set(`
       <div class="mu-kindergarten">
           <button class="mu-kids-button">Click me<button>
-          <div class="mu-kids-overlay" style="display: none"></div>
+          <div class="mu-kids-overlay d-none"></div>
       </div>
   `);
 
@@ -18,7 +18,7 @@ describe('KidsButton', () => {
   });
 
   it('overlay is hidden by default', () => {
-    expect(mumuki.kids.$overlay.css('display')).toBe('none');
+    expect(mumuki.kids.$overlay.hasClass('d-none'));
   });
 
   it('call showOverlay on wait', () => {

data/spec/javascripts/upload-spec.js

@@ -2,11 +2,11 @@ describe('upload', () => {
   const fileSizeLimit = 20;
 
   fixture.set(`
-    <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
-    <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=${fileSizeLimit} accept=".txt" />
-    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success"></label>
-    <button class="btn btn-success btn-block btn-submit disabled"></button>
-    <div id="mu-upload-file-limit-exceeded" class="hidden"></div>
+    <textarea id="solution_content" type="text" name="solution[content]" class="d-none"></textarea>
+    <input id="mu-upload-input" type="file" class="upload submission-control d-none" mu-upload-file-limit=${fileSizeLimit} accept=".txt" />
+    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-complementary"></label>
+    <button class="btn btn-complementary w-100 btn-submit disabled"></button>
+    <div id="mu-upload-file-limit-exceeded" class="d-none"></div>
   `);
 
   beforeEach(() => {
@@ -38,7 +38,7 @@ describe('upload', () => {
     });
 
     it('does not exceed max file size', function () {
-      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(true);
+      expect($('#mu-upload-file-limit-exceeded').hasClass('d-none')).toBe(true);
     });
   });
 
@@ -56,7 +56,7 @@ describe('upload', () => {
     });
 
     it('does not exceed max file size', function () {
-      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(true);
+      expect($('#mu-upload-file-limit-exceeded').hasClass('d-none')).toBe(true);
     });
   });
 
@@ -74,7 +74,7 @@ describe('upload', () => {
     });
 
     it('exceeds max file size', function () {
-      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(false);
+      expect($('#mu-upload-file-limit-exceeded').hasClass('d-none')).toBe(false);
     });
   });
 });