Try to restore page's state

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

@@ -12,18 +12,13 @@ module QA
           end
 
           def expand_section(name)
-            within_section(name) do
-              # Don't expand if it's already expanded
-              click_button 'Expand' unless first('button', text: 'Collapse')
-
-              yield
-            end
-          end
-
-          def within_section(name)
             page.within('#content-body') do
               page.within('section', text: name) do
-                yield
+                click_button 'Expand'
+
+                yield.tap do
+                  click_button 'Collapse' if first('button', text: 'Collapse')
+                end
               end
             end
           end