Merge branch 'add-controller-tests'

geetfun · geetfun · commit e88df52a0c5f · 2022-12-29T10:55:50.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,10 @@
 # Changelog
 
-## Unreleased
+## 1.0.0 (December 29, 2022)
 * Add Docker to allow consistent development environment
 * Remove unneeded files which were added during scaffolding
 * Declare importmap-rails as required
-* Add tests for IngressController
+* Add tests for IngressController, system tests and fixes discovered through those tests
 
 ## 0.1.0 (December 25, 2022)
 * Initial release
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -76,11 +76,21 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     builder (3.2.4)
+    capybara (3.38.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     date (3.3.3)
+    dropybara (1.0.0)
     erubi (1.12.0)
     ffi (1.15.5)
     globalid (1.0.0)
@@ -104,6 +114,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
@@ -177,6 +188,11 @@ GEM
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
+    rubyzip (2.3.2)
+    selenium-webdriver (4.7.1)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -195,20 +211,26 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     zeitwerk (2.6.6)
 
 PLATFORMS
   aarch64-linux
 
 DEPENDENCIES
+  capybara
+  dropybara
   filepond-rails!
   image_processing
   importmap-rails
   puma (~> 6.0)
   rubocop (~> 1.1)
+  selenium-webdriver
   sprockets-rails
   sqlite3
   webmock (~> 3.18)
diff --git a/app/assets/javascripts/filepond-rails.js b/app/assets/javascripts/filepond-rails.js
@@ -59,7 +59,7 @@ let FilePondRails = {
     FilePondRails.input = input
 
     // Initialize FilePond on our element
-    FilePond.create(input, FilePondRails.default_options)
+    return FilePond.create(input, FilePondRails.default_options)
   }
 }
 
diff --git a/filepond-rails.gemspec b/filepond-rails.gemspec
@@ -28,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'puma', '~> 6.0'
   spec.add_development_dependency 'rubocop', '~> 1.1'
   spec.add_development_dependency 'webmock', '~> 3.18'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'dropybara'
+  spec.add_development_dependency 'selenium-webdriver'
 end
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: {
+    browser: :remote,
+    url: ENV['SELENIUM_REMOTE_URL']
+  }
+end
diff --git a/test/dummy/app/javascript/application.js b/test/dummy/app/javascript/application.js
@@ -4,4 +4,4 @@ window.FilePond = FilePond
 window.FilePondRails = FilePondRails
 
 const input = document.querySelector('.filepond')
-FilePondRails.create(input)
+window.filePondInstance = FilePondRails.create(input)
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Dummy</title>
+    <title>filepond-rails Dummy App</title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
diff --git a/test/fixtures/files/toronto.png b/test/fixtures/files/toronto.png
diff --git a/test/integration/.keep b/test/integration/.keep
diff --git a/test/integration/navigation_test.rb b/test/integration/navigation_test.rb
diff --git a/test/system/filepond/rails/uploads_test.rb b/test/system/filepond/rails/uploads_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'application_system_test_case'
+require 'dropybara'
+
+class UploadsTest < ApplicationSystemTestCase
+  setup do
+    ActionController::Base.allow_forgery_protection = true
+    visit(root_url)
+  end
+
+  teardown do
+    ActionController::Base.allow_forgery_protection = false
+  end
+
+  test 'goes to homepage' do
+    assert_selector 'h1', text: 'filepond-rails development'
+  end
+
+  test 'FilePond is loaded' do
+    assert page.evaluate_script("typeof(FilePond) !== 'undefined'")
+  end
+
+  test 'FilePondRails is loaded' do
+    assert page.evaluate_script("typeof(FilePondRails) !== 'undefined'")
+  end
+
+  test 'file upload via file upload' do
+    assert_difference -> { ActiveStorage::Blob.count } do
+      page.execute_script <<~JS
+        window.filePondInstance.addFile("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==")
+        window.filePondInstance.processFile()
+      JS
+      sleep(5) # There is a delay in FilePond due to the UI providing feedback
+    end
+  end
+
+  test 'file upload via fetch' do
+    assert_difference -> { ActiveStorage::Blob.count }, 2 do
+      page.execute_script <<~JS
+        window.filePondInstance.addFile(
+          'https://user-images.githubusercontent.com/16937/209497677-a0ace476-a04f-4efb-be8c-6d263ad5d0e0.png'
+        )
+        window.filePondInstance.processFile()
+      JS
+      sleep(5) # There is a delay in FilePond due to the UI providing feedback
+    end
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -7,6 +7,7 @@
 ActiveRecord::Migrator.migrations_paths = [File.expand_path('../test/dummy/db/migrate', __dir__)]
 ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
 require 'rails/test_help'
+require 'capybara'
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
@@ -15,3 +16,6 @@
   ActiveSupport::TestCase.file_fixture_path = "#{ActiveSupport::TestCase.fixture_path}/files"
   ActiveSupport::TestCase.fixtures :all
 end
+
+Capybara.server_host = '0.0.0.0'
+Capybara.app_host = "http://#{ENV.fetch('HOSTNAME')}:#{Capybara.server_port}"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ let FilePondRails = {`
`59`	`59`	`FilePondRails.input = input`
`60`	`60`
`61`	`61`	`// Initialize FilePond on our element`
`62`		`- FilePond.create(input, FilePondRails.default_options)`
	`62`	`+ return FilePond.create(input, FilePondRails.default_options)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`