Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
c3d0f604
Unverified
Commit
c3d0f604
authored
Mar 13, 2021
by
Jenn Magder
Committed by
GitHub
Mar 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mock from cocoapods_validator_test (#77991)
parent
e7f95b4a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
31 deletions
+22
-31
cocoapods.dart
packages/flutter_tools/lib/src/macos/cocoapods.dart
+3
-3
cocoapods_validator.dart
...ages/flutter_tools/lib/src/macos/cocoapods_validator.dart
+1
-1
cocoapods_validator_test.dart
...ls/test/general.shard/macos/cocoapods_validator_test.dart
+18
-27
No files found.
packages/flutter_tools/lib/src/macos/cocoapods.dart
View file @
c3d0f604
...
...
@@ -71,6 +71,9 @@ enum CocoaPodsStatus {
brokenInstall
,
}
String
get
cocoaPodsMinimumVersion
=>
'1.9.0'
;
String
get
cocoaPodsRecommendedVersion
=>
'1.10.0'
;
/// Cocoapods is a dependency management solution for iOS and macOS applications.
///
/// Cocoapods is generally installed via ruby gems and interacted with via
...
...
@@ -111,9 +114,6 @@ class CocoaPods {
Future
<
String
>
_versionText
;
String
get
cocoaPodsMinimumVersion
=>
'1.9.0'
;
String
get
cocoaPodsRecommendedVersion
=>
'1.10.0'
;
Future
<
bool
>
get
isInstalled
=>
_processUtils
.
exitsHappy
(<
String
>[
'which'
,
'pod'
]);
...
...
packages/flutter_tools/lib/src/macos/cocoapods_validator.dart
View file @
c3d0f604
...
...
@@ -52,7 +52,7 @@ class CocoaPodsValidator extends DoctorValidator {
status
=
ValidationType
.
partial
;
final
String
currentVersionText
=
await
_cocoaPods
.
cocoaPodsVersionText
;
messages
.
add
(
ValidationMessage
.
hint
(
_userMessages
.
cocoaPodsOutdated
(
currentVersionText
,
_cocoaPods
.
cocoaPodsRecommendedVersion
,
noCocoaPodsConsequence
,
cocoaPodsInstallInstructions
)));
_userMessages
.
cocoaPodsOutdated
(
currentVersionText
,
cocoaPodsRecommendedVersion
,
noCocoaPodsConsequence
,
cocoaPodsInstallInstructions
)));
}
}
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View file @
c3d0f604
...
...
@@ -8,62 +8,53 @@ import 'package:flutter_tools/src/base/user_messages.dart';
import
'package:flutter_tools/src/doctor.dart'
;
import
'package:flutter_tools/src/macos/cocoapods.dart'
;
import
'package:flutter_tools/src/macos/cocoapods_validator.dart'
;
import
'package:
mockito/mockito
.dart'
;
import
'package:
test/fake
.dart'
;
import
'../../src/common.dart'
;
void
main
(
)
{
group
(
'CocoaPods validation'
,
()
{
MockCocoaPods
cocoaPods
;
setUp
(()
{
cocoaPods
=
MockCocoaPods
();
when
(
cocoaPods
.
evaluateCocoaPodsInstallation
)
.
thenAnswer
((
_
)
async
=>
CocoaPodsStatus
.
recommended
);
when
(
cocoaPods
.
cocoaPodsVersionText
).
thenAnswer
((
_
)
async
=>
'1.8.0'
);
});
testWithoutContext
(
'Emits installed status when CocoaPods is installed'
,
()
async
{
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
cocoaPods
,
UserMessages
());
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
FakeCocoaPods
(
CocoaPodsStatus
.
recommended
)
,
UserMessages
());
final
ValidationResult
result
=
await
workflow
.
validate
();
expect
(
result
.
type
,
ValidationType
.
installed
);
});
testWithoutContext
(
'Emits missing status when CocoaPods is not installed'
,
()
async
{
when
(
cocoaPods
.
evaluateCocoaPodsInstallation
)
.
thenAnswer
((
_
)
async
=>
CocoaPodsStatus
.
notInstalled
);
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
cocoaPods
,
UserMessages
());
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
FakeCocoaPods
(
CocoaPodsStatus
.
notInstalled
),
UserMessages
());
final
ValidationResult
result
=
await
workflow
.
validate
();
expect
(
result
.
type
,
ValidationType
.
missing
);
});
testWithoutContext
(
'Emits partial status when CocoaPods is installed with unknown version'
,
()
async
{
when
(
cocoaPods
.
evaluateCocoaPodsInstallation
)
.
thenAnswer
((
_
)
async
=>
CocoaPodsStatus
.
unknownVersion
);
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
cocoaPods
,
UserMessages
());
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
FakeCocoaPods
(
CocoaPodsStatus
.
unknownVersion
),
UserMessages
());
final
ValidationResult
result
=
await
workflow
.
validate
();
expect
(
result
.
type
,
ValidationType
.
partial
);
});
testWithoutContext
(
'Emits partial status when CocoaPods version is too low'
,
()
async
{
when
(
cocoaPods
.
evaluateCocoaPodsInstallation
)
.
thenAnswer
((
_
)
async
=>
CocoaPodsStatus
.
belowRecommendedVersion
);
const
String
currentVersion
=
'1.4.0'
;
when
(
cocoaPods
.
cocoaPodsVersionText
)
.
thenAnswer
((
_
)
async
=>
currentVersion
);
const
String
recommendedVersion
=
'1.8.0'
;
when
(
cocoaPods
.
cocoaPodsRecommendedVersion
)
.
thenAnswer
((
_
)
=>
recommendedVersion
);
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
cocoaPods
,
UserMessages
());
final
CocoaPods
fakeCocoaPods
=
FakeCocoaPods
(
CocoaPodsStatus
.
belowRecommendedVersion
,
currentVersion
);
final
CocoaPodsValidator
workflow
=
CocoaPodsValidator
(
fakeCocoaPods
,
UserMessages
());
final
ValidationResult
result
=
await
workflow
.
validate
();
expect
(
result
.
type
,
ValidationType
.
partial
);
expect
(
result
.
messages
.
length
,
1
);
final
ValidationMessage
message
=
result
.
messages
.
first
;
expect
(
message
.
type
,
ValidationMessageType
.
hint
);
expect
(
message
.
message
,
contains
(
'CocoaPods
$currentVersion
out of date'
));
expect
(
message
.
message
,
contains
(
'(
$recommendedVersion
is recommended)'
));
expect
(
message
.
message
,
contains
(
'(
1.10.0
is recommended)'
));
});
});
}
class
MockCocoaPods
extends
Mock
implements
CocoaPods
{}
class
FakeCocoaPods
extends
Fake
implements
CocoaPods
{
FakeCocoaPods
(
this
.
_evaluateCocoaPodsInstallation
,
[
this
.
_cocoaPodsVersionText
]);
@override
Future
<
CocoaPodsStatus
>
get
evaluateCocoaPodsInstallation
async
=>
_evaluateCocoaPodsInstallation
;
final
CocoaPodsStatus
_evaluateCocoaPodsInstallation
;
@override
Future
<
String
>
get
cocoaPodsVersionText
async
=>
_cocoaPodsVersionText
;
final
String
_cocoaPodsVersionText
;
}
Write
Preview
Markdown
is supported
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