Browse Source

Maintenance - Replace all wait.until to check for boolean

Vladimir Sheremet 1 year ago
parent
commit
912460b09c

+ 2 - 4
spec/system/examples/core_workflow_examples.rb

@@ -786,8 +786,7 @@ RSpec.shared_examples 'core workflow' do
 
       it 'does perform' do
         before_it.call
-        wait.until { page.find("select[name='#{field_name}']").value == ['key_3'] }
-        expect(page.find("select[name='#{field_name}']").value).to eq(['key_3'])
+        expect(page).to have_select(field_name, selected: ['value_3'])
       end
     end
 
@@ -813,8 +812,7 @@ RSpec.shared_examples 'core workflow' do
 
       it 'does perform' do
         before_it.call
-        wait.until { page.find("select[name='#{field_name}']").value == ['key_3'] }
-        expect(page.find("select[name='#{field_name}']").value).to eq(['key_3'])
+        expect(page).to have_select(field_name, selected: ['value_3'])
       end
     end
   end

+ 3 - 1
spec/system/setup/first_steps_spec.rb

@@ -51,7 +51,9 @@ RSpec.describe 'First Steps', type: :system do
       click('button')
     end
 
-    wait.until { expect(User.last).to have_attributes(firstname: 'Client', lastname: 'Smith') }
+    wait.until { User.last.firstname == 'Client' }
+
+    expect(User.last).to have_attributes(firstname: 'Client', lastname: 'Smith')
     expect(page).to have_no_text 'Sending'
   end
 

+ 5 - 5
spec/system/system/maintenance_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'System > Maintenance', type: :system do
 
         click '.js-loginSetting label'
 
-        wait.until { expect(Setting.get('maintenance_login')).to be true }
+        wait.until { Setting.get('maintenance_login') == true }
       end
     end
 
@@ -30,7 +30,7 @@ RSpec.describe 'System > Maintenance', type: :system do
 
         click '.js-loginSetting label'
 
-        wait.until { expect(Setting.get('maintenance_login')).to be false }
+        wait.until { Setting.get('maintenance_login') == false }
       end
     end
 
@@ -64,7 +64,7 @@ RSpec.describe 'System > Maintenance', type: :system do
 
         find_by_id('global-search').click # unfocus
 
-        wait.until { expect(Setting.get('maintenance_login_message')).to eq "#{message}#{message_suffix}" }
+        wait.until { Setting.get('maintenance_login_message') == "#{message}#{message_suffix}" }
       end
     end
   end
@@ -85,7 +85,7 @@ RSpec.describe 'System > Maintenance', type: :system do
           click '.js-submit'
         end
 
-        wait.until { expect(Setting.get('maintenance_mode')).to be true }
+        wait.until { Setting.get('maintenance_mode') == true }
       end
     end
 
@@ -100,7 +100,7 @@ RSpec.describe 'System > Maintenance', type: :system do
 
         click '.js-modeSetting label'
 
-        wait.until { expect(Setting.get('maintenance_mode')).to be false }
+        wait.until { Setting.get('maintenance_mode') == false }
       end
     end
   end

+ 2 - 0
spec/system/ticket/inserting_knowledge_base_answer_spec.rb

@@ -50,6 +50,8 @@ RSpec.describe 'inserting Knowledge Base answer', searchindex: true, type: :syst
             script = 'return arguments[0].naturalWidth;'
             height = Capybara.current_session.driver.browser.execute_script(script, elem.native)
 
+            next false if height <= 0
+
             expect(height).to be_positive
           end
         end