Fix rspecs

shakacode · Jul 18, 2022 · d7f4acf · d7f4acf
1 parent 1a1b467
commit d7f4acf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb
@@ -136,7 +136,7 @@ def self.component_name_to_path(paths)
     end
 
     def self.common_component_to_path
-      common_components_paths = Dir.glob("#{components_search_path}/*[!]*")
+      common_components_paths = Dir.glob("#{components_search_path}/*[!(.server.|.client.)]*")
       component_name_to_path(common_components_paths)
     end
 

diff --git a/spec/react_on_rails/packs_generator_spec.rb b/spec/react_on_rails/packs_generator_spec.rb
@@ -21,6 +21,9 @@ module ReactOnRails
     end
 
     after do
+      ReactOnRails.configuration.server_bundle_js_file = nil
+      ReactOnRails.configuration.components_directory = nil
+
       FileUtils.rm_rf("#{webpacker_source_entry_path}/generated")
       FileUtils.rm(generated_server_bundle_file_path)
       File.truncate("#{webpacker_source_entry_path}/#{server_bundle_js_file}", 0)