Merge pull request #62 from blocknotes/fix-flaky-specs

Fix flaky spec

Author: blocknotes

.github/workflows/linters.yml

@@ -11,6 +11,9 @@ jobs:
   reviewdog:
     name: Reviewdog
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
 
     steps:
       - name: Checkout repository

Makefile

@@ -1,14 +1,14 @@
 specs:
 	RUBYOPT='-rbundler/setup -rrbs/test/setup' RBS_TEST_TARGET='TinyAdmin::*' bin/rspec
 
-console:
-	bin/rails c
-
 server:
-	bin/rails s
+	bin/rails s -b 0.0.0.0 -p 4000
 
-seed:
-	bin/rails db:migrate && bin/rails db:seed
+console:
+	bin/rails c
 
 lint:
 	bin/rubocop
+
+seed:
+	cd spec/dummy_rails && bin/rails db:reset

spec/features/plugins/authorization_spec.rb

@@ -7,9 +7,11 @@
   let(:root_content) { "Latest authors\nLatest posts" }
 
   around do |example|
+    TinyAdmin.settings.load_settings
     prev_value = TinyAdmin.settings.authorization_class
     TinyAdmin.settings.authorization_class = some_class
     example.run
+  ensure
     TinyAdmin.settings.authorization_class = prev_value
   end
 

spec/lib/tiny_admin/settings_spec.rb

@@ -8,12 +8,14 @@
 
   # Save and restore the internal options state around each test
   around do |example|
-    saved = settings.instance_variable_get(:@options)&.deep_dup
+    saved_options = settings.instance_variable_get(:@options)&.deep_dup
     saved_store = settings.instance_variable_get(:@store)
+    saved_loaded = settings.instance_variable_get(:@loaded)
     example.run
   ensure
-    settings.instance_variable_set(:@options, saved)
+    settings.instance_variable_set(:@options, saved_options)
     settings.instance_variable_set(:@store, saved_store)
+    settings.instance_variable_set(:@loaded, saved_loaded)
   end
 
   describe "#reset!" do