Merge pull request #31624 from OlimpiaZurek/fix/31145-reassure-perf-t…

…est-workflow [NoQA] change ressure perf test workflow
Expensify · Nov 24, 2023 · e0f849f · e0f849f
2 parents a2fc32b + cdc3424
commit e0f849f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/reassurePerformanceTests.yml b/.github/workflows/reassurePerformanceTests.yml
@@ -22,11 +22,13 @@ jobs:
         run: |
           set -e
           BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
+          CURRENT_BRANCH=$(git branch --show-current)
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
           npm install --force
           npx reassure --baseline
-          git switch --force --detach -
+          git switch "$CURRENT_BRANCH"
+          git merge --no-commit --no-ff "$BASELINE_BRANCH"
           npm install --force
           npx reassure --branch
 

diff --git a/tests/perf-test/ReportScreen.perf-test.js b/tests/perf-test/ReportScreen.perf-test.js
@@ -124,7 +124,7 @@ function ReportScreenWrapper(args) {
 
 const runs = CONST.PERFORMANCE_TESTS.RUNS;
 
-test.skip('should render ReportScreen with composer interactions', () => {
+test('should render ReportScreen with composer interactions', () => {
     const scenario = async () => {
         // Query for the report list
         await screen.findByTestId('report-actions-list');
@@ -175,7 +175,7 @@ test.skip('should render ReportScreen with composer interactions', () => {
         .then(() => measurePerformance(<ReportScreenWrapper route={mockRoute} />, {scenario, runs}));
 });
 
-test.skip('should press of the report item', () => {
+test('should press of the report item', () => {
     const scenario = async () => {
         // Query for the report list
         await screen.findByTestId('report-actions-list');