Verified Commit 14aefab4 authored by Kaspar Vollenweider's avatar Kaspar Vollenweider 👻
Browse files

several changes in order to get gitlab ci back to working

delete department last

find out if ci can live with native

new non slim image, so meybe now its f... working for f.. sake

remove rails-ujs include
parent d5faea0d
......@@ -14,7 +14,7 @@ before_script:
- bundle exec rails db:schema:load
test:
image: git.panter.ch:5001/open-source/aoz-003/unit:2.4.4-slim
image: git.panter.ch:5001/open-source/aoz-003/unit:2.4.4-0.3
stage: test
script:
- bundle exec rails test
......@@ -23,7 +23,7 @@ test:
- /gems_cache
system:
image: git.panter.ch:5001/open-source/aoz-003/system:2.36-bundled
image: git.panter.ch:5001/open-source/aoz-003/system:2.36-0.3
stage: test
script:
- bundle exec rails test:system
......
......@@ -10,7 +10,6 @@
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require rails-ujs
//= require jquery
//= require jquery_ujs
//= require jquery-ui
......
......@@ -73,7 +73,9 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
def fill_field_with_send_keys(locator, text)
field = page.find_field(locator)
text.split('').each { |c| field.send_keys(c) }
text.split('').each do |char|
field.native.send_keys(char)
end
end
def fill_autocomplete(name, options = {})
......
......@@ -20,12 +20,12 @@ class VolunteerSubmitsAfterRemindTest < ApplicationSystemTestCase
visit last_submitted_hours_and_feedbacks_assignment_path(@assignment)
fill_field_with_send_keys('IBAN', 'CH12345')
wait_for_ajax
sleep 1
@volunteer.reload
assert_equal 'CH12345', @volunteer.iban
fill_field_with_send_keys('Bank', 'Name of the bank')
wait_for_ajax
sleep 1
@volunteer.reload
assert_equal 'Name of the bank', @volunteer.bank
......@@ -34,7 +34,7 @@ class VolunteerSubmitsAfterRemindTest < ApplicationSystemTestCase
assert page.has_field? 'Name der Bank', with: 'Name of the bank'
check 'Ich verzichte auf die Auszahlung von Spesen.'
wait_for_ajax
sleep 1
@volunteer.reload
assert @volunteer.waive
......
......@@ -24,8 +24,8 @@ class ActiveSupport::TestCase
really_destroy_with_deleted(
Feedback, TrialFeedback, Hour, Journal, BillingExpense, Certificate, Import,
AssignmentLog, Assignment, GroupAssignmentLog, GroupAssignment, GroupOffer,
ClientNotification, Department, LanguageSkill, Relative, Event, EventVolunteer,
Volunteer, Client, User, Contact
ClientNotification, LanguageSkill, Relative, Event, EventVolunteer,
Volunteer, Client, User, Contact, Department
)
super
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment