From 33deb65051c9ec6dacea227f8f29c1dad35a7041 Mon Sep 17 00:00:00 2001
From: YusukeIwaki <iwaki@i3-systems.com>
Date: Sat, 4 Dec 2021 15:44:09 +0900
Subject: [PATCH] Fix firefox CI and some flaky specs

---
 .circleci/config.yml               | 2 +-
 spec/integration/frame_spec.rb     | 4 ++--
 spec/integration/launcher_spec.rb  | 6 ++++++
 spec/integration/wait_task_spec.rb | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9216a489..71b3567c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,7 +45,7 @@ jobs:
       - run:
           name: rspec
           command: |
-            DEBUG=1 PUPPETEER_PRODUCT_RSPEC=firefox \
+            PUPPETEER_PRODUCT_RSPEC=firefox \
             PUPPETEER_EXECUTABLE_PATH_RSPEC=${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/firefox/firefox \
             bundle exec rspec --profile 10 \
               --failure-exit-code 0 \
diff --git a/spec/integration/frame_spec.rb b/spec/integration/frame_spec.rb
index 5454ce74..40c4e59a 100644
--- a/spec/integration/frame_spec.rb
+++ b/spec/integration/frame_spec.rb
@@ -42,7 +42,7 @@
       detach_frame(page, 'frame1')
       expect {
         frame1.evaluate('() => 7 * 8')
-      }.to raise_error(/Execution Context is not available in detached frame/)
+      }.to raise_error(/Execution Context is not available in detached frame|Cannot find context/)
     end
   end
 
@@ -206,7 +206,7 @@
       expect(page.frames.map(&:parent_frame)).to eq([nil, page.main_frame, page.main_frame])
     end
 
-    it 'should report different frame instance when frame re-attaches' do
+    it_fails_firefox 'should report different frame instance when frame re-attaches' do
       frame1 = attach_frame(page, 'frame1', server_empty_page)
       js = <<~JAVASCRIPT
       () => {
diff --git a/spec/integration/launcher_spec.rb b/spec/integration/launcher_spec.rb
index 377dd8f9..541d165c 100644
--- a/spec/integration/launcher_spec.rb
+++ b/spec/integration/launcher_spec.rb
@@ -112,6 +112,9 @@
     end
 
     it 'user_data_dir option should restore state', sinatra: true do
+      # Too flaky on CI ckeck...
+      skip if Puppeteer.env.firefox? && Puppeteer.env.ci?
+
       Dir.mktmpdir do |user_data_dir|
         options = default_launch_options.merge(
           user_data_dir: user_data_dir,
@@ -134,6 +137,9 @@
     end
 
     it 'user_data_dir option should restore cookies', sinatra: true do
+      # Too flaky on CI ckeck...
+      skip if Puppeteer.env.firefox? && Puppeteer.env.ci?
+
       Dir.mktmpdir do |user_data_dir|
         options = default_launch_options.merge(
           user_data_dir: user_data_dir,
diff --git a/spec/integration/wait_task_spec.rb b/spec/integration/wait_task_spec.rb
index a5cc0ff5..f0be030c 100644
--- a/spec/integration/wait_task_spec.rb
+++ b/spec/integration/wait_task_spec.rb
@@ -125,7 +125,7 @@
       expect(handle.execution_context.frame).to eq(frame2)
     end
 
-    it 'should throw when frame is detached', sinatra: true do
+    it_fails_firefox 'should throw when frame is detached', sinatra: true do
       page.goto(server_empty_page)
       attach_frame(page, 'frame1', server_empty_page)
       frame = page.frames.last