Merge branch 'main' into remote-provider

Author: snehmehta

.ios/Podfile

@@ -1,7 +1,8 @@
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+# need since some packages (workmanager) doesn't set Swift version. Do not remove otherwise integration tests won't work.
 ENV['SWIFT_VERSION'] = '5'
 
 project 'Runner', {
@@ -32,7 +33,6 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 
   pod 'FlutterPluginRegistrant', :path => File.join('Flutter', 'FlutterPluginRegistrant'), :inhibit_warnings => true
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.10.0'
 end
 
 post_install do |installer|

integration_test/framework/test_helper.dart

@@ -17,42 +17,37 @@ class TestHelper {
   /// the result but no longer available for the next run, causing the
   /// subsequent tests to hang. For this reason, call this in your Test class's
   /// setupApp() once before running the tests.
-  static Future<EnsembleConfig> setupApp({required String appName}) async {
-    IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-    WidgetsFlutterBinding.ensureInitialized();
-
-    I18nProps i18nProps = I18nProps('en', 'en', false);
-    i18nProps.path = 'ensemble/i18n';
+  static Future<EnsembleConfig> setupApp(
+      {required String appName, String? forcedLocale}) async {
+    I18nProps i18nProps =
+        I18nProps('en', 'en', false, forcedLocale: forcedLocale);
+    i18nProps.path = 'integration_test/local/$appName/i18n';
 
     EnsembleConfig config = EnsembleConfig(
         definitionProvider: LocalDefinitionProvider(
-            "ensemble/integration_tests/$appName/", "", i18nProps));
-    return await config.updateAppBundle();
+            "integration_test/local/$appName/", "", i18nProps));
+    return config.updateAppBundle();
   }
 
+  // load a screen based on the config returned from setupApp
   static loadScreen(
-      {required String screenName, required EnsembleConfig? config}) {
-    if (config == null) {
-      throw Exception(
-          'Config is required. Please run setupApp() per Test Class to initialize the EnsembleConfig once !');
-    }
-
-    runApp(EnsembleApp(
-      key: UniqueKey(),
+      WidgetTester tester, String screenName, EnsembleConfig config) async {
+    await tester.pumpWidget(EnsembleApp(
       ensembleConfig: config,
-      screenPayload: ScreenPayload(screenName: screenName),
+      screenPayload: ScreenPayload(screenId: screenName),
     ));
+    await tester.pumpAndSettle();
   }
 
   /// initialize an App and init a single screen for testing.
   /// This is a quick way to run a test, but it should be the only test
   /// in your test class.
   /// Considering using setupApp(), followed by loadScreen() for multiple
   /// test cases within a class.
-  static Future<void> setupAppForSingleScreen(
+  static loadAppAndScreen(WidgetTester tester,
       {required String appName, required String screenName}) async {
     EnsembleConfig config = await setupApp(appName: appName);
-    loadScreen(screenName: screenName, config: config);
+    await loadScreen(tester, screenName, config);
   }
 
   /// remove focus if any widget currently has focus

integration_test/local/customWidget_test.dart

@@ -0,0 +1,52 @@
+import 'package:ensemble/ensemble.dart';
+import 'package:ensemble/widget/button.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../framework/test_helper.dart';
+
+void main() {
+  late EnsembleConfig config;
+  setUpAll(() async {
+    config = await TestHelper.setupApp(appName: 'widgets');
+  });
+
+  group('Custom Widgets', () {
+    testWidgets("test basic widget features", (tester) async {
+      await TestHelper.loadScreen(tester, 'Custom Widget', config);
+
+      // test visibility
+      expect(find.text('I am visible'), findsOneWidget);
+      expect(find.text('I am really visible'), findsOneWidget);
+      expect(find.text('I am invisible'), findsNothing);
+
+      await tester.tap(find.descendant(
+          of: find.byType(Button), matching: find.text('Toggle Visibility')));
+      await tester.pumpAndSettle();
+      expect(find.text('I am visible'), findsNothing);
+      expect(find.text('I am really visible'), findsNothing);
+      expect(find.text('I am invisible'), findsOneWidget);
+
+      // test flex and its modification
+
+      // equal distribution with default flex
+      expect(tester.getSize(find.text("hello")).width,
+          tester.getSize(find.text("world")).width);
+
+      // changing flex under FlexBox is a problem because the parent FlexBox already
+      // make the child Expanded if not specified, so if we update it later, there will
+      // be duplicate Expanded.
+      // ALmost like we want to travel up to the Flexbox and ask it to refresh itself,
+      // but that is not recommended. TODO: figure this out
+      // change "world" to 2x
+      // await tester.tap(find.descendant(
+      //     of: find.byType(Button), matching: find.text('Change Flex')));
+      // await tester.pumpAndSettle();
+      // expect(tester.getSize(find.text("hello")).width, 100);
+      // expect(tester.getSize(find.text("world")).width, 200);
+
+      expect(tester.getSize(find.text("1x")).width, 100);
+      expect(tester.getSize(find.text("2x")).width, 200);
+    });
+  });
+}

ensemble/integration_tests/defaultApp/API Bindings.yaml renamed to integration_test/local/defaultApp/API Bindings.yaml

@@ -22,6 +22,9 @@ View:
 
 Custom:
   inputs: [txt]
+  onLoad:
+    showToast:
+      message: Hello ${txt}
   body:
     Column:
       children:
@@ -35,6 +38,13 @@ Custom:
 
 Custom2:
   inputs: [text]
+  onLoad: |-
+    setByJS.text = "Hi " + text;
+
   body:
-    Text:
-      text: "Custom Custom Widget: ${text}"
+    Column:
+      children:
+        - Text:
+            text: "Custom Custom Widget: ${text}"
+        - Text:
+            id: setByJS

ensemble/integration_tests/defaultApp/Conditional.yaml renamed to integration_test/local/defaultApp/Conditional.yaml

@@ -11,11 +11,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test/widget/test_utils.dart';
-import 'framework/test_helper.dart';
+import '../../test/widget/test_utils.dart';
+import '../framework/test_helper.dart';
 
 void main() {
-  EnsembleConfig? config;
+  late EnsembleConfig config;
   setUpAll(() async {
     config = await TestHelper.setupApp(appName: 'defaultApp');
   });
@@ -24,16 +24,22 @@ void main() {
     /// test that binding to a TextInput works properly in the same scope
     /// and also in a custom widget's scope
     testWidgets("Bindings to widget's value", (tester) async {
-      await TestHelper.loadScreen(
-          screenName: 'Widget Bindings', config: config);
-      await tester.pumpAndSettle();
+      await TestHelper.loadScreen(tester, 'Custom Widget', config);
 
       // TextInput has initial value of 'first'
       // so first make sure our EnsembleText is correctly bind to that
       Finder text = find.descendant(
           of: find.byType(EnsembleText), matching: find.text('first'));
       expect(text, findsOneWidget);
 
+      // Custom Widget's onLoad can access inputs
+      // search for toast message
+      await tester.pumpAndSettle();
+      expect(find.text('Hello first'), findsOneWidget);
+
+      // ensure Nested widget's onLoad can access inputs via JS too
+      expect(find.text('Hi first'), findsOneWidget);
+
       // Custom Widget's text should also bind to the same value
       Finder customText = find.descendant(
           of: find.byType(EnsembleText),
@@ -69,11 +75,14 @@ void main() {
           of: find.byType(EnsembleText),
           matching: find.text('Custom Custom Widget: second'));
       expect(customCustomText, findsOneWidget);
+
+      // ensure onLoad never run again and still retain original value
+      expect(find.text('Hi first'), findsOneWidget);
     });
 
     /// test bindings to API is working properly
     testWidgets('API Binding', (tester) async {
-      await TestHelper.loadScreen(screenName: 'API Bindings', config: config);
+      await TestHelper.loadScreen(tester, 'API Bindings', config);
       await tester.pumpAndSettle();
 
       // before the API loads
@@ -101,8 +110,8 @@ void main() {
     });
 
     /// test invokeApi
-    testWidgets("invokeApi Test", (tester) async {
-      await TestHelper.loadScreen(screenName: "Invoke Api", config: config);
+    /**testWidgets("invokeApi Test", (tester) async {
+      await TestHelper.loadScreen(tester, "Invoke Api", config);
       await tester.pumpAndSettle();
 
       await tester.tap(find.widgetWithText(Button, "Call API"));
@@ -118,7 +127,7 @@ void main() {
 
       await tester
           .tap(find.widgetWithText(Button, 'Call API with invalid URI'));
-      await tester.pumpAndSettle(const Duration(seconds: 2));
+      await tester.pumpAndSettle(const Duration(seconds: 4));
       Finder badapiOnerror = find.text("Bad Api onResponse called");
       Finder badApiStatus =
           find.text("Invalid argument(s): No host specified in URI blah");
@@ -132,12 +141,11 @@ void main() {
       Finder errorStatus = find.text("500");
       expect(errorText, findsNWidgets(2));
       expect(errorStatus, findsOneWidget);
-    });
+    });*/
 
     // test nested textSTyle
     testWidgets('Nested TextStyle update via Bindings/JS', (tester) async {
-      await TestHelper.loadScreen(
-          screenName: 'Nested TextStyle', config: config);
+      await TestHelper.loadScreen(tester, 'Nested TextStyle', config);
       await tester.pumpAndSettle();
 
       Finder textFinder = find.descendant(
@@ -187,8 +195,7 @@ void main() {
     /// with side-by-side labels. The structure for both is different hence
     /// the demonstration on how to do for each
     testWidgets('Test finding Ensemble widgets in Forms', (tester) async {
-      await TestHelper.loadScreen(
-          screenName: 'Dropdown and Form', config: config);
+      await TestHelper.loadScreen(tester, 'Dropdown and Form', config);
       await tester.pumpAndSettle();
 
       // two TextInputs on the screen
@@ -243,7 +250,7 @@ void main() {
     });
 
     testWidgets('Conditional', (tester) async {
-      await TestHelper.loadScreen(screenName: 'Conditional', config: config);
+      await TestHelper.loadScreen(tester, 'Conditional', config);
       await tester.pumpAndSettle();
 
       Finder textInputFinder = find.byType(TextInput);