@@ -105,7 +105,7 @@ describe('messaging()', function () {
105105 } ) ;
106106
107107 it ( 'successfully unregisters on ios' , async function ( ) {
108- if ( device . getPlatform ( ) === 'ios' ) {
108+ if ( device . getPlatform ( ) === 'ios' && ! isCI ) {
109109 await firebase . messaging ( ) . unregisterDeviceForRemoteMessages ( ) ;
110110 should . equal ( firebase . messaging ( ) . isDeviceRegisteredForRemoteMessages , false ) ;
111111 tryToRegister = await isAPNSCapableSimulator ( ) ;
@@ -133,8 +133,12 @@ describe('messaging()', function () {
133133 // our default resolve on android is "authorized"
134134 should . equal ( await firebase . messaging ( ) . requestPermission ( { provisional : true } ) , 1 ) ;
135135 } else {
136- // our default request on iOS results in "provisional"
137- should . equal ( await firebase . messaging ( ) . requestPermission ( { provisional : true } ) , 2 ) ;
136+ // our default request on iOS results in "provisional" == 2
137+ // but we may have granted perms by any outside method == 1
138+ should . equal (
139+ ( await firebase . messaging ( ) . requestPermission ( { provisional : true } ) ) >= 1 ,
140+ true ,
141+ ) ;
138142 }
139143 } ) ;
140144 } ) ;
@@ -152,7 +156,11 @@ describe('messaging()', function () {
152156 // Make sure we are registered for remote notifications, else no token
153157 aPNSCapableSimulator = await isAPNSCapableSimulator ( ) ;
154158 simulator = await isSimulator ( ) ;
155- if ( device . getPlatform ( ) === 'ios' && ( ! simulator || ( simulator && aPNSCapableSimulator ) ) ) {
159+ if (
160+ device . getPlatform ( ) === 'ios' &&
161+ ! isCI &&
162+ ( ! simulator || ( simulator && aPNSCapableSimulator ) )
163+ ) {
156164 await firebase . messaging ( ) . registerDeviceForRemoteMessages ( ) ;
157165 apnsToken = await firebase . messaging ( ) . getAPNSToken ( ) ;
158166
@@ -568,7 +576,7 @@ describe('messaging()', function () {
568576 registerDeviceForRemoteMessages,
569577 } = messagingModular ;
570578
571- if ( device . getPlatform ( ) === 'ios' ) {
579+ if ( device . getPlatform ( ) === 'ios' && ! isCI ) {
572580 await unregisterDeviceForRemoteMessages ( getMessaging ( ) ) ;
573581 should . equal ( isDeviceRegisteredForRemoteMessages ( getMessaging ( ) ) , false ) ;
574582 aPNSCapableSimulator = await isAPNSCapableSimulator ( ) ;
@@ -601,8 +609,9 @@ describe('messaging()', function () {
601609 if ( device . getPlatform ( ) === 'android' ) {
602610 should . equal ( await requestPermission ( getMessaging ( ) ) , 1 ) ;
603611 } else {
604- // ... and iOS should always be 2 (provisional)
605- should . equal ( await requestPermission ( getMessaging ( ) , { provisional : true } ) , 2 ) ;
612+ // our default request on iOS results in "provisional" == 2
613+ // but we may have granted perms by any outside method == 1
614+ should . equal ( ( await requestPermission ( getMessaging ( ) , { provisional : true } ) ) >= 1 , true ) ;
606615 }
607616 } ) ;
608617 } ) ;
@@ -622,7 +631,11 @@ describe('messaging()', function () {
622631 const { getMessaging, getAPNSToken, registerDeviceForRemoteMessages } = messagingModular ;
623632 aPNSCapableSimulator = await isAPNSCapableSimulator ( ) ;
624633 simulator = await isSimulator ( ) ;
625- if ( device . getPlatform ( ) === 'ios' && ( ! simulator || ( simulator && aPNSCapableSimulator ) ) ) {
634+ if (
635+ device . getPlatform ( ) === 'ios' &&
636+ ! isCI &&
637+ ( ! simulator || ( simulator && aPNSCapableSimulator ) )
638+ ) {
626639 await registerDeviceForRemoteMessages ( getMessaging ( ) ) ;
627640 apnsToken = await getAPNSToken ( getMessaging ( ) ) ;
628641
0 commit comments