Merge pull request #356 from Workiva/unpin-mockito

FED-1161 Unpin mockito, fix CI

Author: rmconsole5-wk

.github/workflows/dart_ci.yml

@@ -15,7 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [2.13.4, stable, beta]
+        # Can't run on `beta` (Dart 3) until we're fully null-safe.
+        sdk: [2.18.7, stable]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1
@@ -35,7 +36,7 @@ jobs:
 
       - name: Verify formatting
         run: dart format --output=none --line-length=120 --set-exit-if-changed .
-        if: ${{ matrix.sdk == '2.13.4' }}
+        if: ${{ matrix.sdk == '2.18.7' }}
 
       - name: Analyze project source
         run: dart analyze

Dockerfile

@@ -1,4 +1,6 @@
-FROM google/dart:2.13
+FROM drydock-prod.workiva.net/workiva/dart2_base_image:1 as dart2
+
+RUN dart --version
 
 WORKDIR /build
 COPY pubspec.yaml .

lib/react_test_utils.dart

@@ -120,37 +120,27 @@ class Simulate {
 ///
 /// Included in Dart for completeness
 @JS('React.addons.TestUtils.findAllInRenderedTree')
-external List<dynamic> findAllInRenderedTree(
-    /* [1] */ tree,
-    ComponentTestFunction test);
+external List<dynamic> findAllInRenderedTree(/* [1] */ tree, ComponentTestFunction test);
 
 /// Like scryRenderedDOMComponentsWithClass() but expects there to be one
 /// result, and returns that one result, or throws exception if there is
 /// any other number of matches besides one.
 @JS('React.addons.TestUtils.findRenderedDOMComponentWithClass')
-external dynamic /* [1] */ findRenderedDOMComponentWithClass(
-    /* [1] */ tree,
-    String className);
+external dynamic /* [1] */ findRenderedDOMComponentWithClass(/* [1] */ tree, String className);
 
 /// Like scryRenderedDOMComponentsWithTag() but expects there to be one result,
 /// and returns that one result, or throws exception if there is any other
 /// number of matches besides one.
 @JS('React.addons.TestUtils.findRenderedDOMComponentWithTag')
-external dynamic /* [1] */ findRenderedDOMComponentWithTag(
-    /* [1] */ tree,
-    String tag);
+external dynamic /* [1] */ findRenderedDOMComponentWithTag(/* [1] */ tree, String tag);
 
 @JS('React.addons.TestUtils.findRenderedComponentWithType')
-external dynamic /* [1] */ _findRenderedComponentWithType(
-    /* [1] */ tree,
-    dynamic type);
+external dynamic /* [1] */ _findRenderedComponentWithType(/* [1] */ tree, dynamic type);
 
 /// Same as [scryRenderedComponentsWithTypeV2] but expects there to be one result
 /// and returns that one result, or throws exception if there is any other
 /// number of matches besides one.
-/* [1] */ findRenderedComponentWithTypeV2(
-    /* [1] */ tree,
-    ReactComponentFactoryProxy componentFactory) {
+/* [1] */ findRenderedComponentWithTypeV2(/* [1] */ tree, ReactComponentFactoryProxy componentFactory) {
   return _findRenderedComponentWithType(tree, getComponentTypeV2(componentFactory));
 }
 
@@ -171,9 +161,7 @@ external bool _isCompositeComponentWithType(/* [1] */ instance, dynamic type);
 
 /// Returns `true` if instance is a custom composite component created using `React.createClass()`
 /// that is of the [ReactComponentFactoryProxy.type] of the provided [componentFactory].
-bool isCompositeComponentWithTypeV2(
-    /* [1] */ instance,
-    ReactComponentFactoryProxy componentFactory) {
+bool isCompositeComponentWithTypeV2(/* [1] */ instance, ReactComponentFactoryProxy componentFactory) {
   return _isCompositeComponentWithType(instance, getComponentTypeV2(componentFactory));
 }
 
@@ -195,33 +183,25 @@ bool isElementOfTypeV2(dynamic element, ReactComponentFactoryProxy componentFact
 }
 
 @JS('React.addons.TestUtils.scryRenderedComponentsWithType')
-external List<dynamic> /* [1] */ _scryRenderedComponentsWithType(
-    /* [1] */ tree,
-    dynamic type);
+external List<dynamic> /* [1] */ _scryRenderedComponentsWithType(/* [1] */ tree, dynamic type);
 
 /// Finds all instances within the provided [tree]
 /// that are of the [ReactComponentFactoryProxy.type] of the provided [componentFactory].
-List<dynamic> /* [1] */ scryRenderedComponentsWithTypeV2(
-    /* [1] */ tree,
-    ReactComponentFactoryProxy componentFactory) {
+List<dynamic> /* [1] */ scryRenderedComponentsWithTypeV2(/* [1] */ tree, ReactComponentFactoryProxy componentFactory) {
   return _scryRenderedComponentsWithType(tree, getComponentTypeV2(componentFactory));
 }
 
 @JS('React.addons.TestUtils.scryRenderedDOMComponentsWithClass')
 
 /// Finds all instances of components in the rendered tree that are DOM
 /// components with the class name matching className.
-external List<dynamic> scryRenderedDOMComponentsWithClass(
-    /* [1] */ tree,
-    String className);
+external List<dynamic> scryRenderedDOMComponentsWithClass(/* [1] */ tree, String className);
 
 @JS('React.addons.TestUtils.scryRenderedDOMComponentsWithTag')
 
 /// Finds all instances of components in the rendered tree that are DOM
 /// components with the tag name matching tagName.
-external List<dynamic> scryRenderedDOMComponentsWithTag(
-    /* [1] */ tree,
-    String tagName);
+external List<dynamic> scryRenderedDOMComponentsWithTag(/* [1] */ tree, String tagName);
 
 /// Render a Component into a detached DOM node in the document.
 @JS('React.addons.TestUtils.renderIntoDocument')

pubspec.yaml

@@ -8,14 +8,11 @@ dependencies:
   js: ^0.6.0
   meta: ^1.6.0
 dev_dependencies:
-  args: ">=1.5.1 <3.0.0"
+  args: ^2.0.0
   build_runner: ^2.1.2
   build_test: ^2.1.3
   build_web_compilers: ^3.0.0
   dependency_validator: ^3.2.2
   matcher: ^0.12.11
-  mockito: '>=5.0.0 <5.3.0' # pin to workaround https://github.com/dart-lang/mockito/issues/552
+  mockito: ^5.3.1
   test: ^1.17.12
-dependency_validator:
-  ignore:
-    - mockito

test/lifecycle_test.dart

@@ -723,8 +723,12 @@ void sharedLifecycleTests<T extends react.Component>({
           'newProp': 'new',
         };
 
-        final Map initialPropsWithDefaults = unmodifiableMap({}..addAll(defaultProps)..addAll(initialProps));
-        final Map newPropsWithDefaults = unmodifiableMap({}..addAll(defaultProps)..addAll(newProps));
+        final Map initialPropsWithDefaults = unmodifiableMap({}
+          ..addAll(defaultProps)
+          ..addAll(initialProps));
+        final Map newPropsWithDefaults = unmodifiableMap({}
+          ..addAll(defaultProps)
+          ..addAll(newProps));
 
         const Map expectedState = const {};
 
@@ -871,7 +875,9 @@ void sharedLifecycleTests<T extends react.Component>({
           'ref': ((ref) => component = ref),
         };
 
-        var initialProps = new Map.from(defaultProps)..addAll(initialContext)..addAll({'children': const []});
+        var initialProps = new Map.from(defaultProps)
+          ..addAll(initialContext)
+          ..addAll({'children': const []});
         // Add the 'ref' prop separately so it isn't an expected prop since React removes it internally
         var initialPropsWithRef = new Map.from(initialProps)..addAll(refMap);
 
@@ -935,8 +941,12 @@ void sharedLifecycleTests<T extends react.Component>({
       const Map initialProps = const {'initialProp': 'initial', 'children': const []};
       const Map newProps = const {'newProp': 'new', 'children': const []};
 
-      final Map initialPropsWithDefaults = unmodifiableMap({}..addAll(defaultProps)..addAll(initialProps));
-      final Map newPropsWithDefaults = unmodifiableMap({}..addAll(defaultProps)..addAll(newProps));
+      final Map initialPropsWithDefaults = unmodifiableMap({}
+        ..addAll(defaultProps)
+        ..addAll(initialProps));
+      final Map newPropsWithDefaults = unmodifiableMap({}
+        ..addAll(defaultProps)
+        ..addAll(newProps));
 
       const Map expectedState = const {};
       final dynamic expectedContext = isComponent2 ? null : const {};
@@ -1205,8 +1215,12 @@ void sharedLifecycleTests<T extends react.Component>({
         initialProps = unmodifiableMap({'getInitialState': (_) => initialState, 'initialState': (_) => initialState});
         newState1 = {'foo': 'bar'};
         newState2 = {'baz': 'foobar'};
-        expectedState1 = {}..addAll(initialState)..addAll(newState1);
-        expectedState2 = {}..addAll(expectedState1)..addAll(newState2);
+        expectedState1 = {}
+          ..addAll(initialState)
+          ..addAll(newState1);
+        expectedState2 = {}
+          ..addAll(expectedState1)
+          ..addAll(newState2);
 
         component = getDartComponent(render(LifecycleTest(initialProps)));
         component.lifecycleCalls.clear();