Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
05122f8a
Verified
Commit
05122f8a
authored
Jul 16, 2018
by
Kaspar Vollenweider
👻
Browse files
fix format helper and adapt billing expenses system test to new wording
parent
b3cac959
Pipeline
#22561
failed with stage
in 77 minutes and 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/helpers/format_helper.rb
View file @
05122f8a
...
...
@@ -4,6 +4,7 @@ module FormatHelper
end
def
format_hours
(
hours
)
hours
=
hours
.
to_i
if
(
hours
%
1
).
zero?
t
(
'activerecord.attributes.billing_expense.hours'
,
count:
hours
)
end
...
...
test/system/billing_expenses_test.rb
View file @
05122f8a
...
...
@@ -109,7 +109,7 @@ class BillingExpensesTest < ApplicationSystemTestCase
visit
billing_expenses_path
click_link
'Spesenformulare er
stell
en'
click_link
'Spesenformulare er
fass
en'
assert_text
"
#{
volunteer2
}
#{
volunteer2
.
iban
}
26 Stunden Fr. 100.00 1. Semester 2018"
assert_text
"
#{
volunteer3
}
#{
volunteer3
.
iban
}
3 Stunden Fr. 50.00 1. Semester 2018"
refute_text
volunteer1
...
...
@@ -118,7 +118,7 @@ class BillingExpensesTest < ApplicationSystemTestCase
click_link
'Semester: 1. Semester 2018'
click_link
'2. Semester 2017'
click_link
'Spesenformulare er
stell
en'
click_link
'Spesenformulare er
fass
en'
assert_text
"
#{
volunteer1
}
#{
volunteer1
.
iban
}
26 Stunden Fr. 100.00 2. Semester 2017"
assert_text
"
#{
volunteer2
}
#{
volunteer2
.
iban
}
15 Stunden Fr. 50.00 2. Semester 2017"
refute_text
volunteer3
...
...
@@ -127,10 +127,10 @@ class BillingExpensesTest < ApplicationSystemTestCase
click_link
'Semester: 1. Semester 2018'
click_link
'Alle'
click_link
'Spesenformulare er
stell
en'
click_link
'Spesenformulare er
fass
en'
assert_text
"
#{
volunteer1
}
#{
volunteer1
.
iban
}
26 Stunden Fr. 100.00 2. Semester 2017"
assert_text
"
#{
volunteer2
}
#{
volunteer2
.
iban
}
41 Stunden Fr. 100.00"
\
' 2. Semester 2017
-
1. Semester 2018'
' 2. Semester 2017
–
1. Semester 2018'
assert_text
"
#{
volunteer3
}
#{
volunteer3
.
iban
}
3 Stunden Fr. 50.00 1. Semester 2018"
end
...
...
@@ -142,7 +142,7 @@ class BillingExpensesTest < ApplicationSystemTestCase
# creating billing_expense for hours in the current semester
visit
billing_expenses_path
click_link
'Spesenformulare er
stell
en'
click_link
'Spesenformulare er
fass
en'
within
"#
#{
dom_id
(
volunteer
)
}
"
do
check
'selected_volunteers[]'
...
...
@@ -196,7 +196,7 @@ class BillingExpensesTest < ApplicationSystemTestCase
click_link
'Semester: 1. Semester 2018'
click_link
'Alle'
assert_text
"
#{
volunteer
}
#{
volunteer
.
iban
}
42 Stunden Fr. 100.00"
\
' 2. Semester 2017
-
1. Semester 2018'
' 2. Semester 2017
–
1. Semester 2018'
end
test
'volunteer profile shows only billing expenses for this volunteer'
do
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment