Just don't expand if it's already expanded

qa/qa/page/project/settings/common.rb

@@ -14,11 +14,9 @@ module QA
           def expand_section(name)
             page.within('#content-body') do
               page.within('section', text: name) do
-                click_button 'Expand'
+                click_button 'Expand' unless first('button', text: 'Collapse')
 
-                yield.tap do
-                  click_button 'Collapse' if first('button', text: 'Collapse')
-                end
+                yield
               end
             end
           end