diff --git a/__e2e__/tests/merge-feed.test.skip.ts b/__e2e__/tests/merge-feed.test.ts similarity index 79% rename from __e2e__/tests/merge-feed.test.skip.ts rename to __e2e__/tests/merge-feed.test.ts index 4a8b3cbcef..3ff7e529af 100644 --- a/__e2e__/tests/merge-feed.test.skip.ts +++ b/__e2e__/tests/merge-feed.test.ts @@ -11,7 +11,6 @@ describe('Mergefeed', () => { }) it('Login', async () => { - await element(by.id('e2eOpenLoggedOutView')).tap() await loginAsAlice() await element(by.id('e2eToggleMergefeed')).tap() await element(by.id('bottomBarFeedsBtn')).tap() @@ -45,6 +44,20 @@ describe('Mergefeed', () => { 0.5, 0.5, ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'up', + 'fast', + 1, + 0.5, + 0.5, + ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'up', + 'fast', + 1, + 0.5, + 0.5, + ) // feed users await expect( element( @@ -53,14 +66,7 @@ describe('Mergefeed', () => { ).toHaveText('Post 0') }) - it('Sees the expected mix of posts with replies disabled', async () => { - await element(by.id('followingFeedPage-feed-flatlist')).swipe( - 'down', - 'fast', - 1, - 0.5, - 0.5, - ) + it.skip('Sees the expected mix of posts with replies disabled', async () => { await element(by.id('followingFeedPage-feed-flatlist')).swipe( 'down', 'fast', @@ -70,7 +76,25 @@ describe('Mergefeed', () => { ) await element(by.id('viewHeaderHomeFeedPrefsBtn')).tap() await element(by.id('toggleRepliesBtn')).tap() + await expect(element(by.id('confirmBtn'))).toBeVisible() await element(by.id('confirmBtn')).tap() + await expect( + element(by.id('followingFeedPage-feed-flatlist')), + ).toBeVisible() + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'down', + 'fast', + 1, + 0.5, + 0.5, + ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'down', + 'fast', + 1, + 0.5, + 0.5, + ) await element(by.id('followingFeedPage-feed-flatlist')).swipe( 'down', 'slow', @@ -97,6 +121,13 @@ describe('Mergefeed', () => { 0.5, 0.5, ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'up', + 'fast', + 1, + 0.5, + 0.5, + ) // feed users await expect( @@ -106,7 +137,7 @@ describe('Mergefeed', () => { ).toHaveText('Post 0') }) - it('Sees the expected mix of posts with no follows', async () => { + it.skip('Sees the expected mix of posts with no follows', async () => { await element(by.id('followingFeedPage-feed-flatlist')).swipe( 'down', 'fast', @@ -136,7 +167,21 @@ describe('Mergefeed', () => { await element(by.id('bottomBarHomeBtn')).tap() await element(by.id('followingFeedPage-feed-flatlist')).swipe( 'down', - 'slow', + 'fast', + 1, + 0.5, + 0.5, + ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'down', + 'fast', + 1, + 0.5, + 0.5, + ) + await element(by.id('followingFeedPage-feed-flatlist')).swipe( + 'down', + 'fast', 1, 0.5, 0.5, diff --git a/src/env.ts b/src/env.ts index fbcc15f576..2358c83639 100644 --- a/src/env.ts +++ b/src/env.ts @@ -1,9 +1,15 @@ export const IS_TEST = process.env.EXPO_PUBLIC_ENV === 'test' export const IS_DEV = __DEV__ -export const IS_PROD = !IS_DEV +export const IS_PROD = !__DEV__ export const LOG_DEBUG = process.env.EXPO_PUBLIC_LOG_DEBUG || '' export const LOG_LEVEL = (process.env.EXPO_PUBLIC_LOG_LEVEL || 'info') as | 'debug' | 'info' | 'warn' | 'error' + +if (IS_DEV) { + console.log( + JSON.stringify({IS_TEST, IS_DEV, IS_PROD, LOG_DEBUG, LOG_LEVEL}, null, 2), + ) +} diff --git a/src/lib/analytics/analytics.tsx b/src/lib/analytics/analytics.tsx index 383378ad21..299d5722db 100644 --- a/src/lib/analytics/analytics.tsx +++ b/src/lib/analytics/analytics.tsx @@ -8,6 +8,7 @@ import {Native} from 'sentry-expo' import {useSession, SessionAccount} from '#/state/session' import {TrackEvent, AnalyticsMethods} from './types' import {logger} from '#/logger' +import {IS_DEV, IS_TEST} from '#/env' type AppInfo = { build?: string | undefined @@ -24,6 +25,7 @@ function getClient(): SegmentClient { writeKey: '8I6DsgfiSLuoONyaunGoiQM7A6y2ybdI', trackAppLifecycleEvents: false, proxy: 'https://api.events.bsky.app/v1', + debug: IS_DEV && !IS_TEST, }) } return segmentClient