diff --git a/modules/meeting/app/views/meetings/new.html.erb b/modules/meeting/app/views/meetings/new.html.erb index 80c79e86297d..a60a99bef50d 100644 --- a/modules/meeting/app/views/meetings/new.html.erb +++ b/modules/meeting/app/views/meetings/new.html.erb @@ -57,6 +57,7 @@ See COPYRIGHT and LICENSE files for more details. :id => 'meeting-form', target: '_top', :data => { + turbo: false, controller: 'refresh-on-form-changes', 'refresh-on-form-changes-target': 'form', 'refresh-on-form-changes-turbo-stream-url-value': new_meeting_url diff --git a/modules/meeting/spec/features/meetings_new_spec.rb b/modules/meeting/spec/features/meetings_new_spec.rb index 05b5edc32e5e..e43c4f02b1e9 100644 --- a/modules/meeting/spec/features/meetings_new_spec.rb +++ b/modules/meeting/spec/features/meetings_new_spec.rb @@ -129,7 +129,7 @@ end end - context "without a project set", skip: "TEMP" do + context "without a project set" do before do new_page.visit! new_page.set_title "Some title" @@ -181,7 +181,7 @@ show_page.expect_invited(admin) end - context "without a project set", skip: "TEMP" do + context "without a project set" do before do new_page.visit! new_page.set_title "Some title" @@ -190,15 +190,12 @@ it "renders a validation error" do new_page.click_create - expect_flash( - message: "#{Project.model_name.human} #{I18n.t('activerecord.errors.messages.blank')}", - type: :error - ) + expect(page).to have_text "#{Project.model_name.human} #{I18n.t('activerecord.errors.messages.blank')}" new_page.expect_project_dropdown end end - context "without a title set", skip: "TEMP" do + context "without a title set" do before do new_page.visit! @@ -259,7 +256,7 @@ end end - context "without a title set", skip: "TEMP" do + context "without a title set" do before do new_page.visit! new_page.set_start_date "2013-03-28" diff --git a/modules/meeting/spec/support/pages/meetings/new.rb b/modules/meeting/spec/support/pages/meetings/new.rb index 907fd0138f04..75c10326e84b 100644 --- a/modules/meeting/spec/support/pages/meetings/new.rb +++ b/modules/meeting/spec/support/pages/meetings/new.rb @@ -70,7 +70,11 @@ def set_project(project) end def set_start_date(date) - fill_in "Start date", with: date, fill_options: { clear: :backspace } + if using_cuprite? + fill_in "Start date", with: date + else + fill_in "Start date", with: date, fill_options: { clear: :backspace } + end end def set_start_time(time)