Migrate e2e testing to integration_test

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.1
+
+* Remove compatibility with V1 plugin embedding
+* Upgrade integration_test dependency
+
+
 ## 2.0.0 (20201022)
 
 * Migrate to Zendesk Chat SDK v2

android/src/main/java/com/codeheadlabs/zendesk/ZendeskPlugin.java

@@ -18,6 +18,7 @@
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.util.ArrayList;
+import java.util.List;
 import zendesk.chat.Chat;
 import zendesk.chat.ChatConfiguration;
 import zendesk.chat.ChatEngine;
@@ -36,11 +37,6 @@ public class ZendeskPlugin implements FlutterPlugin, ActivityAware, ChatApi, Pro
 
   public ZendeskPlugin() {}
 
-  public static void registerWith(Registrar registrar) {
-    ZendeskPlugin plugin = new ZendeskPlugin();
-    plugin.startListening(registrar.context(), registrar.messenger());
-  }
-
   @Override
   public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
     startListening(binding.getApplicationContext(), binding.getBinaryMessenger());
@@ -137,7 +133,7 @@ public void setVisitorInfo(SetVisitorInfoRequest arg) {
   @Override
   public void addVisitorTags(VisitorTagsRequest arg) {
     final ProfileProvider profileProvider = getProfileProvider();
-    ArrayList raw = arg.getTags();
+    List<Object> raw = arg.getTags();
     ArrayList<String> tags = new ArrayList<>();
     for (Object o : raw) {
       if (o instanceof String) {
@@ -151,7 +147,7 @@ public void addVisitorTags(VisitorTagsRequest arg) {
   @Override
   public void removeVisitorTags(VisitorTagsRequest arg) {
     final ProfileProvider profileProvider = getProfileProvider();
-    ArrayList raw = arg.getTags();
+    List<Object> raw = arg.getTags();
     ArrayList<String> tags = new ArrayList<>();
     for (Object o : raw) {
       if (o instanceof String) {

example/android/app/src/main/AndroidManifest.xml

@@ -34,13 +34,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-          android:name=".EmbeddingV1Activity"
-          android:theme="@style/LaunchTheme"
-          android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
-          android:hardwareAccelerated="true"
-          android:windowSoftInputMode="adjustResize" />
-
         <meta-data android:name="flutterEmbedding" android:value="2"/>
     </application>
 </manifest>

example/test_driver/zendesk_e2e.dart → example/integration_test/visitor_info_test.dart

@@ -1,11 +1,13 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:e2e/e2e.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:zendesk/zendesk.dart';
 
 void main() {
-  E2EWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('sets visitor info', (WidgetTester tester) async {
+    await Zendesk().init('ABC');
+
     await Zendesk().setVisitorInfo(
       name: 'some-user',
       email: 'email@domain.com',

example/pubspec.yaml

@@ -1,6 +1,9 @@
 name: zendesk_example
 description: Demonstrates how to use the zendesk plugin.
 
+environment:
+  sdk: '>=2.10.0 <3.0.0'
+
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
 # followed by an optional build number separated by a +.
@@ -13,15 +16,10 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  e2e: ^0.5.0
-  flutter_driver:
+  integration_test:
     sdk: flutter
 
   zendesk:

example/test_driver/integration_test.dart

@@ -0,0 +1,5 @@
+import 'dart:async';
+
+import 'package:integration_test/integration_test_driver.dart';
+
+Future<void> main() => integrationDriver();

ios/Classes/zendesk.pigeon.h

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v0.1.9), do not edit directly.
+// Autogenerated from Pigeon (v0.1.23), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 #import <Foundation/Foundation.h>
 @protocol FlutterBinaryMessenger;

ios/Classes/zendesk.pigeon.m

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v0.1.9), do not edit directly.
+// Autogenerated from Pigeon (v0.1.23), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 #import "zendesk.pigeon.h"
 #import <Flutter/Flutter.h>
@@ -7,19 +7,19 @@
 #error File requires ARC to be enabled.
 #endif
 
-static NSDictionary* wrapResult(NSDictionary *result, FlutterError *error) {
+static NSDictionary<NSString*, id>* wrapResult(NSDictionary *result, FlutterError *error) {
   NSDictionary *errorDict = (NSDictionary *)[NSNull null];
   if (error) {
-    errorDict = [NSDictionary dictionaryWithObjectsAndKeys:
-        (error.code ? error.code : [NSNull null]), @"code",
-        (error.message ? error.message : [NSNull null]), @"message",
-        (error.details ? error.details : [NSNull null]), @"details",
-        nil];
+    errorDict = @{
+        @"code": (error.code ? error.code : [NSNull null]),
+        @"message": (error.message ? error.message : [NSNull null]),
+        @"details": (error.details ? error.details : [NSNull null]),
+        };
   }
-  return [NSDictionary dictionaryWithObjectsAndKeys:
-      (result ? result : [NSNull null]), @"result",
-      errorDict, @"error",
-      nil];
+  return @{
+      @"result": (result ? result : [NSNull null]),
+      @"error": errorDict,
+      };
 }
 
 @interface InitializeRequest ()
@@ -179,8 +179,8 @@ void ChatApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ChatApi> api) {
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         InitializeRequest *input = [InitializeRequest fromMap:message];
+        FlutterError *error;
         [api initialize:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -196,8 +196,8 @@ void ChatApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ChatApi> api) {
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         SetDepartmentRequest *input = [SetDepartmentRequest fromMap:message];
+        FlutterError *error;
         [api setDepartment:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -213,8 +213,8 @@ void ChatApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ChatApi> api) {
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         StartChatRequest *input = [StartChatRequest fromMap:message];
+        FlutterError *error;
         [api startChat:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -232,8 +232,8 @@ void ProfileApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ProfileApi>
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         SetVisitorInfoRequest *input = [SetVisitorInfoRequest fromMap:message];
+        FlutterError *error;
         [api setVisitorInfo:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -249,8 +249,8 @@ void ProfileApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ProfileApi>
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         VisitorTagsRequest *input = [VisitorTagsRequest fromMap:message];
+        FlutterError *error;
         [api addVisitorTags:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -266,8 +266,8 @@ void ProfileApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ProfileApi>
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         VisitorTagsRequest *input = [VisitorTagsRequest fromMap:message];
+        FlutterError *error;
         [api removeVisitorTags:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -283,8 +283,8 @@ void ProfileApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ProfileApi>
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         VisitorNoteRequest *input = [VisitorNoteRequest fromMap:message];
+        FlutterError *error;
         [api setVisitorNote:input error:&error];
         callback(wrapResult(nil, error));
       }];
@@ -300,8 +300,8 @@ void ProfileApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ProfileApi>
         binaryMessenger:binaryMessenger];
     if (api) {
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
         VisitorNoteRequest *input = [VisitorNoteRequest fromMap:message];
+        FlutterError *error;
         [api appendVisitorNote:input error:&error];
         callback(wrapResult(nil, error));
       }];