Update tests to isolate marionette failures

lib/capybara/spec/session/click_button_spec.rb

@@ -413,12 +413,9 @@ Capybara::SpecHelper.spec '#click_button' do
     @session.visit('/form')
     @session.fill_in('address1_city', :with =>'Paris')
     @session.fill_in('address1_street', :with =>'CDG')
-    @session.fill_in('address1_street', :with =>'CDG')
-    @session.select("France", :from => 'address1_country')
 
     @session.fill_in('address2_city', :with => 'Mikolaiv')
     @session.fill_in('address2_street', :with => 'PGS')
-    @session.select("Ukraine", :from => 'address2_country')
 
     @session.click_button "awesome"
 

lib/capybara/spec/session/execute_script_spec.rb

@@ -2,7 +2,12 @@
 Capybara::SpecHelper.spec "#execute_script", :requires => [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
-    expect(@session.execute_script("$('#change').text('Funky Doodle')")).to be_nil
+    expect(@session.execute_script("document.getElementById('change').textContent = 'Funky Doodle'")).to be_nil
     expect(@session).to have_css('#change', :text => 'Funky Doodle')
   end
+
+  it "should be able to call functions defined in the page" do
+    @session.visit('/with_js')
+    expect{ @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
+  end
 end

lib/capybara/spec/views/form.erb

@@ -253,7 +253,7 @@ New line after and before textarea tag
 
     <label for='address1_country'>Country</label>
     <select name="form[addresses][][country]" id="address1_country">
-      <option>France</option>
+      <option selected>France</option>
       <option>Ukraine</option>
     </select>
   </p>
@@ -269,7 +269,7 @@ New line after and before textarea tag
     <label for='address2_country'>Country</label>
     <select name="form[addresses][][country]" id="address2_country">
       <option>France</option>
-      <option>Ukraine</option>
+      <option selected>Ukraine</option>
     </select>
   </p>