Fakultas Ilmu Komputer UI
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ppl-fasilkom-ui
IT Project 2020
Group B
pilar-mobile
Commits
e81b5c26
Commit
e81b5c26
authored
Jan 11, 2021
by
Tsamara Esperanti Erwin
Browse files
fix conflict on json
parent
b111b5c6
Pipeline
#62546
passed with stages
in 19 minutes
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
test/mock/donation.json
View file @
e81b5c26
...
...
@@ -17,10 +17,7 @@
"transfer_destination_bank_name"
:
null
,
"transfer_destination_bank_account_name"
:
null
,
"transfer_destination_bank_account_number"
:
null
,
<<<<<<<
HEAD
"donation_type"
:
"CSH"
,
=======
>>>>>>>
1
ce
093
fbb
8
b
7
c
3
cef
92
dece
67
fd
3333
ce
60
acea
8
"created_at"
:
"2020-05-02T17:20:33.493414+07:00"
,
"updated_at"
:
"2020-05-02T17:20:33.493505+07:00"
}
\ No newline at end of file
test/mock/transaction.json
View file @
e81b5c26
...
...
@@ -40,21 +40,14 @@
"proof_of_payment"
:
"ada"
,
"user_bank_name"
:
null
,
"user_bank_account_name"
:
"adada"
,
<<<<<<<
HEAD
"bank_account_transfer_destination"
:
"f1291c48-793c-4d44-89fe-6f64452f8aa9"
,
=======
>>>>>>>
1
ce
093
fbb
8
b
7
c
3
cef
92
dece
67
fd
3333
ce
60
acea
8
"transfer_destination_bank_name"
:
null
,
"transfer_destination_bank_account_name"
:
null
,
"transfer_destination_bank_account_number"
:
null
,
"created_at"
:
"2020-04-16T15:04:22.073683+07:00"
,
"updated_at"
:
"2020-04-20T16:58:37.049871+07:00"
,
<<<<<<<
HEAD
"subtotal"
:
"155040.00"
,
"batch"
:
"e24ae351-0cd1-450a-8050-b56594d680b4"
,
"batch_name"
:
"batch 1"
,
"end_date"
:
"2020-10-17"
=======
"subtotal"
:
"155040.00"
>>>>>>>
1
ce
093
fbb
8
b
7
c
3
cef
92
dece
67
fd
3333
ce
60
acea
8
}
\ No newline at end of file
test/program_page_test.dart
View file @
e81b5c26
...
...
@@ -155,9 +155,6 @@ void main() {
expect
(
find
.
text
(
'Rumah Belajar'
),
findsNWidgets
(
11
));
expect
(
find
.
text
(
'DETAIL'
),
findsNWidgets
(
11
));
expect
(
find
.
text
(
'Selesai'
),
findsNothing
);
expect
(
find
.
byType
(
Card
),
findsNWidgets
(
3
));
expect
(
find
.
text
(
'Rumah Belajar'
),
findsNWidgets
(
3
));
expect
(
find
.
text
(
'DETAIL'
),
findsNWidgets
(
3
));
});
testWidgets
(
'No program'
,
(
WidgetTester
tester
)
async
{
...
...
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