- <%= styled_radio_button_tag 'meeting[type]',
- 'classic',
- true,
- no_label: true,
- class: 'radio-button' %>
-
+ <% if @meeting.new_record? %>
+
-
+ <% end %>
<% if global_meeting_create_context? %>
@@ -142,15 +144,15 @@ See COPYRIGHT and LICENSE files for more details.
<%= f.number_field :duration,
- id: 'meeting-form-duration',
- required: true,
- size: 5,
- no_label: true,
- min: 0.00,
- step: 0.25,
- max: 168,
- suffix: t(:text_in_hours),
- container_class: '-xslim' %>
+ id: 'meeting-form-duration',
+ required: true,
+ size: 5,
+ no_label: true,
+ min: 0.00,
+ step: 0.25,
+ max: 168,
+ suffix: t(:text_in_hours),
+ container_class: '-xslim' %>
diff --git a/modules/meeting/spec/features/meetings_copy_spec.rb b/modules/meeting/spec/features/meetings_copy_spec.rb
index a7558b9ad4ee..0bd102932c95 100644
--- a/modules/meeting/spec/features/meetings_copy_spec.rb
+++ b/modules/meeting/spec/features/meetings_copy_spec.rb
@@ -94,6 +94,8 @@
expect(page)
.to have_field 'Time', with: start_time.strftime("%H:%M")
+ choose 'Classic'
+
click_button "Create"
# Be on the new meeting's page with copied over attributes
diff --git a/modules/meeting/spec/features/meetings_new_spec.rb b/modules/meeting/spec/features/meetings_new_spec.rb
index 49ecffb621ca..d8885752d8da 100644
--- a/modules/meeting/spec/features/meetings_new_spec.rb
+++ b/modules/meeting/spec/features/meetings_new_spec.rb
@@ -87,6 +87,7 @@
expect_angular_frontend_initialized # Wait for project dropdown to be ready
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
new_page.set_project project
new_page.set_start_date '2013-03-28'
@@ -133,6 +134,7 @@
before do
new_page.visit!
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
new_page.set_start_date '2013-03-28'
new_page.set_start_time '13:30'
new_page.set_duration '1.5'
@@ -168,6 +170,7 @@
expect_angular_frontend_initialized # Wait for project dropdown to be ready
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
new_page.set_project project
@@ -185,6 +188,7 @@
before do
new_page.visit!
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
end
it 'renders a validation error' do
@@ -242,6 +246,7 @@
new_page.visit!
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
new_page.set_start_date '2013-03-28'
new_page.set_start_time '13:30'
new_page.set_duration '1.5'
@@ -298,6 +303,7 @@
it 'allows creating meeting in a project without members' do
new_page.visit!
+ new_page.set_type 'Classic'
new_page.set_title 'Some title'
show_page = new_page.click_create
@@ -327,6 +333,7 @@
new_page.visit!
new_page.set_title 'Some title'
+ new_page.set_type 'Classic'
show_page = new_page.click_create
diff --git a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb
index e91e1f99ced9..3054cd7ab240 100644
--- a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb
@@ -2,7 +2,10 @@
require_relative 'shared_context'
require 'features/work_packages/table/context_menu/context_menu_shared_examples'
-RSpec.describe 'Work package table context menu', :js, with_ee: %i[team_planner_view] do
+RSpec.describe 'Work package table context menu',
+ :js,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
let!(:work_package) do
diff --git a/modules/team_planner/spec/features/team_planner_dates_spec.rb b/modules/team_planner/spec/features/team_planner_dates_spec.rb
index d14e2ca81ece..b940244ebc62 100644
--- a/modules/team_planner/spec/features/team_planner_dates_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_dates_spec.rb
@@ -29,7 +29,10 @@
require 'spec_helper'
require_relative './shared_context'
-RSpec.describe 'Team planner working days', js: true, with_ee: %i[team_planner_view] do
+RSpec.describe 'Team planner working days',
+ js: true,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
context 'with week days defined' do
diff --git a/modules/team_planner/spec/features/team_planner_error_handling_spec.rb b/modules/team_planner/spec/features/team_planner_error_handling_spec.rb
index 172542249706..098d08b16312 100644
--- a/modules/team_planner/spec/features/team_planner_error_handling_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_error_handling_spec.rb
@@ -29,7 +29,9 @@
require 'spec_helper'
require_relative './shared_context'
-RSpec.describe 'Team planner error handling', js: true do
+RSpec.describe 'Team planner error handling',
+ js: true,
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
let!(:work_package) do
diff --git a/modules/team_planner/spec/features/team_planner_remove_event_spec.rb b/modules/team_planner/spec/features/team_planner_remove_event_spec.rb
index 19d6e5cc0c1b..48ba23a3dae9 100644
--- a/modules/team_planner/spec/features/team_planner_remove_event_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_remove_event_spec.rb
@@ -30,7 +30,10 @@
require_relative 'shared_context'
require_relative '../support/components/add_existing_pane'
-RSpec.describe 'Team planner remove event', :js, with_ee: %i[team_planner_view] do
+RSpec.describe 'Team planner remove event',
+ :js,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
let!(:viewer_role) { create(:project_role, permissions: [:view_work_packages]) }
diff --git a/modules/team_planner/spec/features/team_planner_spec.rb b/modules/team_planner/spec/features/team_planner_spec.rb
index 36f34a104e77..31bf31b3a643 100644
--- a/modules/team_planner/spec/features/team_planner_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_spec.rb
@@ -29,7 +29,10 @@
require 'spec_helper'
require_relative 'shared_context'
-RSpec.describe 'Team planner', :js, with_ee: %i[team_planner_view] do
+RSpec.describe 'Team planner',
+ :js,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
it 'hides the internally used filters' do
diff --git a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
index 53c9e9415791..70c4f32c53cb 100644
--- a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
@@ -29,7 +29,10 @@
require 'spec_helper'
require_relative 'shared_context'
-RSpec.describe 'Team planner constraints for a subproject', :js, with_ee: %i[team_planner_view] do
+RSpec.describe 'Team planner constraints for a subproject',
+ :js,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
let!(:other_user) do
diff --git a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb
index 4a35fba33070..28782860bc35 100644
--- a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb
@@ -29,7 +29,10 @@
require 'spec_helper'
require_relative 'shared_context'
-RSpec.describe 'Team planner drag&dop and resizing', :js, with_ee: %i[team_planner_view] do
+RSpec.describe 'Team planner drag&dop and resizing',
+ :js,
+ with_ee: %i[team_planner_view],
+ with_settings: { start_of_week: 1 } do
include_context 'with team planner full access'
let!(:other_user) do
diff --git a/modules/team_planner/spec/support/pages/team_planner.rb b/modules/team_planner/spec/support/pages/team_planner.rb
index 059df4be4550..42bc43b27cef 100644
--- a/modules/team_planner/spec/support/pages/team_planner.rb
+++ b/modules/team_planner/spec/support/pages/team_planner.rb
@@ -261,7 +261,7 @@ def change_wp_date_by_resizing(work_package, number_of_days:, is_start_date:)
resizer = is_start_date ? wp_strip.find('.fc-event-resizer-start') : wp_strip.find('.fc-event-resizer-end')
- drag_by_pixel(element: resizer, by_x: number_of_days * 180, by_y: 0) unless resizer.nil?
+ drag_by_pixel(element: resizer, by_x: number_of_days * 250, by_y: 0) unless resizer.nil?
end
def drag_wp_by_pixel(work_package, by_x, by_y)