Merge pull request riseuplabs#91 from azul/test/fix-pending-ajax

deal with edit being the default tab for empty wikis

Author: azul

test/helpers/integration/navigation.rb

@@ -1,6 +1,12 @@
 module Integration
   module Navigation
 
+    def select_page_tab(tab)
+      return if find('#page_tabs li.tab.active').has_content?(tab)
+      click_page_tab(tab)
+      assert_page_tab(tab)
+    end
+
     def click_page_tab(tab)
       find('#page_tabs').click_on(tab)
     end

test/helpers/integration/wiki.rb

@@ -2,9 +2,7 @@ module Integration
   module Wiki
     def update_wiki(content = nil)
       # work around not being on edit to begin with
-      click_page_tab 'Edit'
-      # ensure the edit page is loaded
-      find('li.active a.active', text: 'Edit')
+      select_page_tab 'Edit'
       content ||= Faker::Lorem.paragraphs(4).join("\n")
       within('form.edit_wiki') do
         fill_in 'wiki[body]', with: content