fix reading openproject/version

pull/6834/head
Jens Ulferts 6 years ago
parent 4b748ec759
commit b5cab16bed
No known key found for this signature in database
GPG Key ID: 3CAA4B1182CF5308
  1. 3
      Gemfile.modules
  2. 28
      modules/grids/spec/features/my/my_page_spec.rb

@ -13,6 +13,9 @@ gem 'omniauth-openid-connect',
ref: '46f0c33bee2c885c89dd2866f5cf847da62b3482'
group :opf_plugins do
# included so that engines can reference OpenProject::Version
$:.push File.expand_path("../lib", __FILE__)
gem 'openproject-global_roles', path: 'modules/global_roles'
gem 'openproject-auth_plugins', path: 'modules/auth_plugins'
gem 'openproject-auth_saml', path: 'modules/auth_saml'

@ -115,19 +115,19 @@ describe 'My page', type: :feature, js: true do
# Disabling the following as it leads to false positives on travis only
# dragging makes room for the dragged widget which means
# that widgets that have been there are moved down
#watched_area.drag_to(1, 3)
#watched_area.expect_to_span(1, 3, 4, 5)
#calendar_area.expect_to_span(4, 1, 6, 5)
#assigned_area.expect_to_span(6, 1, 12, 3)
#created_area.expect_to_span(6, 3, 12, 5)
#calendar_area.drag_to(3, 4)
## reduces the size of calendar as the widget would otherwise not fit
#calendar_area.expect_to_span(3, 4, 5, 7)
#watched_area.expect_to_span(5, 3, 8, 5)
#assigned_area.expect_to_span(6, 1, 12, 3)
#created_area.expect_to_span(8, 3, 14, 5)
# # dragging makes room for the dragged widget which means
# # that widgets that have been there are moved down
# watched_area.drag_to(1, 3)
# watched_area.expect_to_span(1, 3, 4, 5)
# calendar_area.expect_to_span(4, 1, 6, 5)
# assigned_area.expect_to_span(6, 1, 12, 3)
# created_area.expect_to_span(6, 3, 12, 5)
# calendar_area.drag_to(3, 4)
# # reduces the size of calendar as the widget would otherwise not fit
# calendar_area.expect_to_span(3, 4, 5, 7)
# watched_area.expect_to_span(5, 3, 8, 5)
# assigned_area.expect_to_span(6, 1, 12, 3)
# created_area.expect_to_span(8, 3, 14, 5)
end
end

Loading…
Cancel
Save