tiny refactor

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

.github/workflows/ci.yml

@@ -186,6 +186,7 @@ jobs:
           path: |
             ${{ github.workspace }}/plotly_static/static_example.*
             ${{ github.workspace }}/plotly/plotly_example.*
+            ${{ github.workspace }}/plotly/plotly_example_surface.*
           retention-days: 30
 
   code-coverage:

plotly/src/plot.rs

@@ -1075,11 +1075,18 @@ mod tests {
     fn save_to_pdf() {
         let plot = create_test_plot();
         let dst = PathBuf::from("plotly_example.pdf");
-        let mut exporter = plotly_static::StaticExporterBuilder::default()
+        #[cfg(feature = "debug")]
+        let mut exporter = StaticExporterBuilder::default()
+            .spawn_webdriver(true)
             .webdriver_port(get_unique_port())
             .pdf_export_timeout(750)
             .build()
             .unwrap();
+        #[cfg(not(feature = "debug"))]
+        let mut exporter = plotly_static::StaticExporterBuilder::default()
+            .webdriver_port(get_unique_port())
+            .build()
+            .unwrap();
         plot.write_image_with_exporter(&mut exporter, &dst, ImageFormat::PDF, 1024, 680, 1.0)
             .unwrap();
         assert!(dst.exists());
@@ -1173,7 +1180,7 @@ mod tests {
             .name("Surface");
 
         plot.add_trace(surface);
-        let dst = PathBuf::from("plotly_example.png");
+        let dst = PathBuf::from("plotly_example_surface.png");
         let mut exporter = plotly_static::StaticExporterBuilder::default()
             .webdriver_port(get_unique_port())
             .build()

plotly_static/src/lib.rs

@@ -1249,39 +1249,6 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
-    #[test]
-    fn save_jpeg_sequentially() {
-        init();
-        let test_plot = create_test_plot();
-        let mut export = StaticExporterBuilder::default()
-            .spawn_webdriver(true)
-            .webdriver_port(get_unique_port())
-            .build()
-            .unwrap();
-
-        let dst = PathBuf::from("static_example.jpeg");
-        export
-            .write_fig(dst.as_path(), &test_plot, ImageFormat::JPEG, 1200, 900, 4.5)
-            .unwrap();
-        assert!(dst.exists());
-        let metadata = std::fs::metadata(&dst).expect("Could not retrieve file metadata");
-        let file_size = metadata.len();
-        assert!(file_size > 0,);
-        #[cfg(not(feature = "debug"))]
-        assert!(std::fs::remove_file(dst.as_path()).is_ok());
-
-        let dst = PathBuf::from("example2.jpeg");
-        export
-            .write_fig(dst.as_path(), &test_plot, ImageFormat::JPEG, 1200, 900, 4.5)
-            .unwrap();
-        assert!(dst.exists());
-        let metadata = std::fs::metadata(&dst).expect("Could not retrieve file metadata");
-        let file_size = metadata.len();
-        assert!(file_size > 0,);
-        #[cfg(not(feature = "debug"))]
-        assert!(std::fs::remove_file(dst.as_path()).is_ok());
-    }
-
     #[test]
     fn save_svg() {
         init();
@@ -1355,6 +1322,39 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[test]
+    fn save_jpeg_sequentially() {
+        init();
+        let test_plot = create_test_plot();
+        let mut export = StaticExporterBuilder::default()
+            .spawn_webdriver(true)
+            .webdriver_port(get_unique_port())
+            .build()
+            .unwrap();
+
+        let dst = PathBuf::from("static_example.jpeg");
+        export
+            .write_fig(dst.as_path(), &test_plot, ImageFormat::JPEG, 1200, 900, 4.5)
+            .unwrap();
+        assert!(dst.exists());
+        let metadata = std::fs::metadata(&dst).expect("Could not retrieve file metadata");
+        let file_size = metadata.len();
+        assert!(file_size > 0,);
+        #[cfg(not(feature = "debug"))]
+        assert!(std::fs::remove_file(dst.as_path()).is_ok());
+
+        let dst = PathBuf::from("example2.jpeg");
+        export
+            .write_fig(dst.as_path(), &test_plot, ImageFormat::JPEG, 1200, 900, 4.5)
+            .unwrap();
+        assert!(dst.exists());
+        let metadata = std::fs::metadata(&dst).expect("Could not retrieve file metadata");
+        let file_size = metadata.len();
+        assert!(file_size > 0,);
+        #[cfg(not(feature = "debug"))]
+        assert!(std::fs::remove_file(dst.as_path()).is_ok());
+    }
+
     #[test]
     #[cfg(feature = "chromedriver")]
     // Skip this test for geckodriver as it doesn't support multiple concurrent