add teardown

Author: KazuCocoa

test/functional/android/android/image_comparison_test.rb

@@ -12,7 +12,6 @@ def setup
 
       def teardown
         save_reports(@driver)
-        @@core.quit_driver
       end
 
       def test_image_comparison_match_result

test/functional/android/android/mjpeg_server_test.rb

@@ -7,21 +7,22 @@ module Android
     class MjpegServerTest < AppiumLibCoreTest::Function::TestCase
       def setup
         @@core ||= ::Appium::Core.for(Caps.android)
-        @@driver ||= @@core.start_driver
+        @driver = @@core.start_driver
       end
 
       def teardown
         save_reports(@@driver)
+        @@core.quit_driver
       end
 
       def test_start_recording_screen
         to_path = 'recorded_file_android.mp4'
         File.delete to_path if File.exist? to_path
 
-        @@driver.start_recording_screen time_limit: '2'
-        @@driver.find_element(:accessibility_id, 'App').click
+        @driver.start_recording_screen time_limit: '2'
+        @driver.find_element(:accessibility_id, 'App').click
         sleep 2 # second
-        @@driver.stop_and_save_recording_screen to_path
+        @driver.stop_and_save_recording_screen to_path
         assert File.exist? to_path
       end
     end

test/functional/android/patch_test.rb

@@ -11,6 +11,7 @@ def setup
 
     def teardown
       save_reports(@driver)
+      @driver.quit
     end
 
     def test_method_missing_attributes

test/functional/android/webdriver/device_test.rb

@@ -99,7 +99,7 @@ def test_accept_alert
         # assert @driver.switch_to.alert.dismiss
         @@core.wait { assert_equal 'OK', @driver.find_element(:id, 'android:id/button1').text.upcase }
         result = @driver.find_element(:id, 'android:id/button1').click
-        assert result.nil? || result.empty?
+        assert result.nil? || result
       end
 
       def test_dismiss_alert
@@ -115,7 +115,7 @@ def test_dismiss_alert
         # Because the results depends on OS version.
         @@core.wait { assert_equal 'CANCEL', @driver.find_element(:id, 'android:id/button2').text.upcase }
         result = @driver.find_element(:id, 'android:id/button2').click
-        assert result.nil? || result.empty?
+        assert result.nil? || result
       end
 
       def test_implicit_wait

test/functional/ios/ios/image_comparison_test.rb

@@ -10,7 +10,11 @@ module Ios
     class ImageComparisionTest < AppiumLibCoreTest::Function::TestCase
       def setup
         @@core ||= ::Appium::Core.for(Caps.ios)
-        @@driver ||= @@core.start_driver
+        @driver ||= @@core.start_driver
+      end
+
+      def teardown
+        save_reports(@driver)
       end
 
       def test_image_comparison_match_result