best_in_place 2.1.0 → 3.0.0.rc1

data/spec/integration/double_init_spec.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
-require "spec_helper"
 
 describe "Double initialization bug", :js => true do
   before do
-    @user = User.new :name => "Lucia",
+    @user = User.create :name => "Lucia",
       :last_name => "Napoli",
       :email => "lucianapoli@gmail.com",
       :height => "5' 5\"",
@@ -16,18 +15,17 @@ describe "Double initialization bug", :js => true do
   end
 
   it "should be able to change a boolean value" do
-    @user.save!
     visit double_init_user_path(@user)
 
     within("#receive_email") do
-      page.should have_content("No thanks")
+      expect(page).to have_content("No thanks")
     end
 
     bip_bool @user, :receive_email
 
     visit double_init_user_path(@user)
     within("#receive_email") do
-      page.should have_content("Yes of course")
+      expect(page).to have_content("Yes of course")
     end
 
   end

data/spec/integration/js_spec.rb

@@ -1,18 +1,16 @@
 # encoding: utf-8
-require "spec_helper"
 
 describe "JS behaviour", :js => true do
   before do
     @user = User.new :name => "Lucia",
       :last_name => "Napoli",
       :email => "lucianapoli@gmail.com",
-      :height => "5' 5\"",
+      :height => "h51",
       :address => "Via Roma 99",
       :zip => "25123",
       :country => "2",
       :receive_email => false,
       :birth_date => Time.now.utc,
-      :description => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a lectus et lacus ultrices auctor. Morbi aliquet convallis tincidunt. Praesent enim libero, iaculis at commodo nec, fermentum a dolor. Quisque eget eros id felis lacinia faucibus feugiat et ante. Aenean justo nisi, aliquam vel egestas vel, porta in ligula. Etiam molestie, lacus eget tincidunt accumsan, elit justo rhoncus urna, nec pretium neque mi et lorem. Aliquam posuere, dolor quis pulvinar luctus, felis dolor tincidunt leo, eget pretium orci purus ac nibh. Ut enim sem, suscipit ac elementum vitae, sodales vel sem.",
       :money => 100,
       :money_proc => 100,
       :favorite_color => 'Red',
@@ -26,10 +24,20 @@ describe "JS behaviour", :js => true do
       @user.save!
       visit admin_user_path(@user)
 
-      within("#last_name") { page.should have_content("Napoli") }
+      within("#last_name") { expect(page).to have_content("Napoli") }
       bip_text @user, :last_name, "Other thing"
 
-      within("#last_name") { page.should have_content("Other thing") }
+      within("#last_name") { expect(page).to have_content("Other thing") }
+    end
+
+    it 'should be able to use another url' do
+      @user.save!
+      visit admin_user_path(@user)
+
+      within('#name') { expect(page).to have_content("Lucia") }
+      bip_text @user, :name, 'Other thing'
+
+      within('#name') { expect(page).to have_content('Other thing') }
     end
   end
 
@@ -40,7 +48,7 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       within("#name") do
-        page.should have_content("\u2014")
+        expect(page).to have_content('-')
       end
     end
 
@@ -52,7 +60,7 @@ describe "JS behaviour", :js => true do
       bip_text @user, :money, "abcd"
 
       within("#money") do
-        page.should have_content("\u2014")
+        expect(page).to have_content('-')
       end
     end
 
@@ -62,20 +70,20 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       within("#last_name") do
-        page.should have_content("Nothing to show")
+        expect(page).to have_content("Nothing to show")
       end
     end
 
-    it "should render html content for nil option" do
+    it 'should render html content for placeholder option' do
       @user.favorite_color = ""
       @user.save!
       visit user_path(@user)
       within("#favorite_color") do
-        page.should have_xpath("//span[@class='nil']")
+        expect(page).to have_xpath("//span[@class='placeholder']")
       end
     end
 
-    it "should render html content for nil option after edit" do
+    it 'should render html content for placeholder option after edit' do
       @user.favorite_color = "Blue"
       @user.save!
       visit user_path(@user)
@@ -83,7 +91,7 @@ describe "JS behaviour", :js => true do
       bip_text @user, :favorite_color, ""
 
       within("#favorite_color") do
-        page.should have_xpath("//span[@class='nil']")
+        expect(page).to have_xpath("//span[@class='placeholder']")
       end
     end
 
@@ -93,7 +101,7 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       within("#favorite_locale") do
-        page.should have_content("N/A")
+        expect(page).to have_content("N/A")
       end
 
       id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_locale
@@ -102,7 +110,7 @@ describe "JS behaviour", :js => true do
       JS
 
       text = page.find("##{id} input").value
-      text.should == ""
+      expect(text).to eq("")
 
       page.execute_script <<-JS
         $("##{id} input[name='favorite_locale']").blur();
@@ -115,7 +123,7 @@ describe "JS behaviour", :js => true do
       JS
 
       text = page.find("##{id} input").value
-      text.should == ""
+      expect(text).to eq("")
     end
   end
 
@@ -138,10 +146,9 @@ describe "JS behaviour", :js => true do
       :description => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a lectus et lacus ultrices auctor. Morbi aliquet convallis tincidunt. Praesent enim libero, iaculis at commodo nec, fermentum a dolor. Quisque eget eros id felis lacinia faucibus feugiat et ante. Aenean justo nisi, aliquam vel egestas vel, porta in ligula. Etiam molestie, lacus eget tincidunt accumsan, elit justo rhoncus urna, nec pretium neque mi et lorem. Aliquam posuere, dolor quis pulvinar luctus, felis dolor tincidunt leo, eget pretium orci purus ac nibh. Ut enim sem, suscipit ac elementum vitae, sodales vel sem."
 
     visit users_path
-
     within("tr#user_#{@user.id} > .name > span") do
-      page.should have_content("Lucia")
-      page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+      expect(page).to have_content("Lucia")
+      expect(page).to have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :name
@@ -152,7 +159,7 @@ describe "JS behaviour", :js => true do
     JS
 
     within("tr#user_#{@user.id} > .name > span") do
-      page.should have_content('Lisa')
+      expect(page).to have_content('Lisa')
     end
   end
 
@@ -160,14 +167,14 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
     within("#email") do
-      page.should have_content("lucianapoli@gmail.com")
+      expect(page).to have_content("lucianapoli@gmail.com")
     end
 
     bip_text @user, :email, "new@email.com"
 
     visit user_path(@user)
     within("#email") do
-      page.should have_content("new@email.com")
+      expect(page).to have_content("new@email.com")
     end
   end
 
@@ -178,18 +185,18 @@ describe "JS behaviour", :js => true do
     bip_text @user, :email, "new@email.com"
 
     within("#email") do
-      page.should have_content("new@email.com")
+      expect(page).to have_content("new@email.com")
     end
 
     bip_text @user, :email, "new_two@email.com"
 
     within("#email") do
-      page.should have_content("new_two@email.com")
+      expect(page).to have_content("new_two@email.com")
     end
 
     visit user_path(@user)
     within("#email") do
-      page.should have_content("new_two@email.com")
+      expect(page).to have_content("new_two@email.com")
     end
   end
 
@@ -198,16 +205,16 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     bip_text @user, :email, "wrong format"
-    page.should have_content("Email has wrong email format")
+    expect(page).to have_content("Email has wrong email format")
 
     bip_text @user, :email, "another@email.com"
     within("#email") do
-      page.should have_content("another@email.com")
+      expect(page).to have_content("another@email.com")
     end
 
     visit user_path(@user)
     within("#email") do
-      page.should have_content("another@email.com")
+      expect(page).to have_content("another@email.com")
     end
   end
 
@@ -215,14 +222,14 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
     within("#country") do
-      page.should have_content("Italy")
+      expect(page).to have_content("Italy")
     end
 
     bip_select @user, :country, "France"
 
     visit user_path(@user)
     within("#country") do
-      page.should have_content("France")
+      expect(page).to have_content("France")
     end
   end
 
@@ -231,7 +238,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     find('#country span').click
-    find('#country').should have_css('select.some_class')
+    expect(find('#country')).to have_css('select.some_class')
   end
 
   it "should be able to use bip_text to change a date field" do
@@ -239,14 +246,14 @@ describe "JS behaviour", :js => true do
     today = Time.now.utc.to_date
     visit user_path(@user)
     within("#birth_date") do
-      page.should have_content(today)
+      expect(page).to have_content(today)
     end
 
     bip_text @user, :birth_date, (today - 1.days)
 
     visit user_path(@user)
     within("#birth_date") do
-      page.should have_content(today - 1.days)
+      expect(page).to have_content(today - 1.days)
     end
   end
 
@@ -255,7 +262,7 @@ describe "JS behaviour", :js => true do
     today = Time.now.utc.to_date
     visit user_path(@user)
     within("#birth_date") do
-      page.should have_content(today)
+      expect(page).to have_content(today)
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :birth_date
@@ -266,7 +273,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#birth_date") do
-      page.should have_content(today.beginning_of_month)
+      expect(page).to have_content(today.beginning_of_month)
     end
   end
 
@@ -275,7 +282,7 @@ describe "JS behaviour", :js => true do
     today = Time.now.utc.to_date
     visit user_path(@user)
     within("#birth_date") do
-      page.should have_content(today)
+      expect(page).to have_content(today)
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :birth_date
@@ -285,7 +292,7 @@ describe "JS behaviour", :js => true do
     JS
 
     within("#birth_date") do
-      page.should have_content(today.beginning_of_month.strftime("%d-%m-%Y"))
+      expect(page).to have_content(today.beginning_of_month.strftime("%d-%m-%Y"))
     end
   end
 
@@ -294,14 +301,14 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#receive_email") do
-      page.should have_content("No thanks")
+      expect(page).to have_content("No thanks")
     end
 
     bip_bool @user, :receive_email
 
     visit user_path(@user)
     within("#receive_email") do
-      page.should have_content("Yes of course")
+      expect(page).to have_content("Yes of course")
     end
   end
 
@@ -310,14 +317,14 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#receive_email_image") do
-      page.should have_xpath("//img[contains(@src,'no.png')]")
+      expect(page).to have_xpath("//img[contains(@src,'no.png')]")
     end
 
     bip_bool @user, :receive_email
 
     visit user_path(@user)
     within("#receive_email_image") do
-      page.should have_xpath("//img[contains(@src,'yes.png')]")
+      expect(page).to have_xpath("//img[contains(@src,'yes.png')]")
     end
   end
 
@@ -326,7 +333,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
@@ -335,8 +342,8 @@ describe "JS behaviour", :js => true do
       $("##{id} input[name='favorite_color']").val('Blue');
     JS
 
-    page.find("##{id} input[type='submit']").value.should == 'Do it!'
-    page.should have_css("##{id} input[type='submit'].custom-submit.other-custom-submit")
+    expect(page.find("##{id} input[type='submit']").value).to eq('Do it!')
+    expect(page).to have_css("##{id} input[type='submit'].custom-submit.other-custom-submit")
 
     page.execute_script <<-JS
       $("##{id} input[type='submit']").click();
@@ -344,7 +351,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_color") do
-      page.should have_content('Blue')
+      expect(page).to have_content('Blue')
     end
   end
 
@@ -353,7 +360,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
@@ -362,8 +369,8 @@ describe "JS behaviour", :js => true do
       $("##{id} input[name='favorite_color']").val('Blue');
     JS
 
-    page.find("##{id} input[type='button']").value.should == 'Nope'
-    page.should have_css("##{id} input[type='button'].custom-cancel.other-custom-cancel")
+    expect(page.find("##{id} input[type='button']").value).to eq('Nope')
+    expect(page).to have_css("##{id} input[type='button'].custom-cancel.other-custom-cancel")
 
     page.execute_script <<-JS
       $("##{id} input[type='button']").click();
@@ -371,7 +378,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
   end
 
@@ -386,9 +393,9 @@ describe "JS behaviour", :js => true do
       $("##{id} input[type='button']").click();
     JS
 
-    lambda { page.driver.browser.switch_to.alert }.should raise_exception(Selenium::WebDriver::Error::NoAlertPresentError)
+    expect { page.driver.browser.switch_to.alert }.to raise_exception(Selenium::WebDriver::Error::NoAlertPresentError)
     within("#favorite_movie") do
-      page.should have_content("The Hitchhiker's Guide to the Galaxy")
+      expect(page).to have_content("The Hitchhiker's Guide to the Galaxy")
     end
   end
 
@@ -397,7 +404,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
@@ -410,7 +417,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
   end
 
@@ -419,12 +426,12 @@ describe "JS behaviour", :js => true do
     visit user_path(@user, :suppress_ok_button => 1)
 
     within("#favorite_color") do
-      page.should have_content('Red')
+      expect(page).to have_content('Red')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
     page.execute_script %{$("##{id}").click();}
-    page.should have_no_css("##{id} input[type='submit']")
+    expect(page).to have_no_css("##{id} input[type='submit']")
     page.execute_script <<-JS
       $("##{id} input[name='favorite_color']").val('Blue');
       $("##{id} input[name='favorite_color']").blur();
@@ -434,7 +441,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_color") do
-      page.should have_content('Blue')
+      expect(page).to have_content('Blue')
     end
   end
 
@@ -443,7 +450,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
@@ -455,7 +462,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_books") do
-      page.should have_content('1Q84')
+      expect(page).to have_content('1Q84')
     end
   end
 
@@ -464,7 +471,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
@@ -473,11 +480,10 @@ describe "JS behaviour", :js => true do
       $("##{id} textarea").val('1Q84');
       $("##{id} input[type='button']").click();
     JS
-    page.driver.browser.switch_to.alert.accept
 
     visit user_path(@user)
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
   end
 
@@ -486,7 +492,7 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
@@ -497,11 +503,10 @@ describe "JS behaviour", :js => true do
       $("##{id} textarea").blur();
     JS
     sleep 1 # Increase if browser is slow
-    page.driver.browser.switch_to.alert.accept
 
     visit user_path(@user)
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
   end
 
@@ -510,12 +515,12 @@ describe "JS behaviour", :js => true do
     visit user_path(@user, :suppress_ok_button => 1)
 
     within("#favorite_books") do
-      page.should have_content('The City of Gold and Lead')
+      expect(page).to have_content('The City of Gold and Lead')
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
     page.execute_script %{$("##{id}").click();}
-    page.should have_no_css("##{id} input[type='submit']")
+    expect(page).to have_no_css("##{id} input[type='submit']")
     page.execute_script <<-JS
       $("##{id} textarea").val('1Q84');
       $("##{id} textarea").blur();
@@ -525,7 +530,7 @@ describe "JS behaviour", :js => true do
 
     visit user_path(@user)
     within("#favorite_books") do
-      page.should have_content('1Q84')
+      expect(page).to have_content('1Q84')
     end
   end
 
@@ -534,9 +539,9 @@ describe "JS behaviour", :js => true do
     visit user_path(@user)
 
     bip_text @user, :address, ""
-    page.should have_content("Address can't be blank")
+    expect(page).to have_content("Address can't be blank")
     within("#address") do
-      page.should have_content("Via Roma 99")
+      expect(page).to have_content("Via Roma 99")
     end
   end
 
@@ -549,9 +554,9 @@ describe "JS behaviour", :js => true do
       $("##{id}").bind('best_in_place:update', function() { $('body').append('Last name was updated!') });
     JS
 
-    page.should have_no_content('Last name was updated!')
+    expect(page).to have_no_content('Last name was updated!')
     bip_text @user, :last_name, 'Another'
-    page.should have_content('Last name was updated!')
+    expect(page).to have_content('Last name was updated!')
   end
 
   it "should fire off a callback when retrieve success with empty data" do
@@ -563,9 +568,9 @@ describe "JS behaviour", :js => true do
       $("##{id}").bind('best_in_place:success', function() { $('body').append('Updated successfully!') });
     JS
 
-    page.should have_no_content('Updated successfully!')
+    expect(page).to have_no_content('Updated successfully!')
     bip_text @user, :last_name, 'Empty'
-    page.should have_content('Updated successfully!')
+    expect(page).to have_content('Updated successfully!')
   end
 
   describe "display_as" do
@@ -574,7 +579,7 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       within("#address") do
-        page.should have_content("addr => [Via Roma 99]")
+        expect(page).to have_content("addr => [Via Roma 99]")
       end
     end
 
@@ -585,7 +590,7 @@ describe "JS behaviour", :js => true do
       bip_text @user, :address, "inva"
 
       within("#address") do
-        page.should have_content("addr => [Via Roma 99]")
+        expect(page).to have_content("addr => [Via Roma 99]")
       end
     end
 
@@ -596,10 +601,34 @@ describe "JS behaviour", :js => true do
       bip_text @user, :address, "New address"
 
       within("#address") do
-        page.should have_content("addr => [New address]")
+        expect(page).to have_content("addr => [New address]")
+      end
+    end
+
+    it "should show default em-dash when the new result with the custom format is nil after an update" do
+      @user.save
+      visit user_path(@user)
+
+      bip_text @user, :zip, ""
+
+      within("#zip") do
+        expect(page).to have_content("-")
       end
     end
 
+    it "should be editable after the new result with the custom format is nil because of an update" do
+      @user.save
+      visit user_path(@user)
+
+      bip_text @user, :zip, ""
+
+      id = BestInPlace::Utils.build_best_in_place_id @user, :zip
+      find("##{id}").click
+
+      text = page.find("##{id} input").value
+      expect(text).to eq("")
+    end
+
     it "should display the original content when editing the form" do
       @user.save!
       retry_on_timeout do
@@ -611,7 +640,7 @@ describe "JS behaviour", :js => true do
         JS
 
         text = page.find("##{id} input").value
-        text.should == "Via Roma 99"
+        expect(text).to eq("Via Roma 99")
       end
     end
 
@@ -632,20 +661,20 @@ describe "JS behaviour", :js => true do
         sleep 1
 
         text = page.find("##{id} input").value
-        text.should == "New address"
+        expect(text).to eq("New address")
       end
     end
 
     it "should quote properly the data-original-content attribute" do
       @user.address = "A's & B's"
       @user.save!
+
       retry_on_timeout do
         visit user_path(@user)
-
         id = BestInPlace::Utils.build_best_in_place_id @user, :address
 
-        text = page.find("##{id}")["data-original-content"]
-        text.should == "A's & B's"
+        text = page.find("##{id}")['data-bip-original-content']
+        expect(text).to eq("A's & B's")
       end
     end
   end
@@ -657,7 +686,7 @@ describe "JS behaviour", :js => true do
 
       visit user_path(@user)
 
-      within("#dw_description") { page.should have_content("\u2014") }
+      within("#dw_description") { expect(page).to have_content('-') }
     end
 
     it "should render the money using number_to_currency" do
@@ -665,7 +694,7 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       within("#money") do
-        page.should have_content("$100.00")
+        expect(page).to have_content("$100.00")
       end
     end
 
@@ -673,11 +702,11 @@ describe "JS behaviour", :js => true do
       @user.save!
       visit user_path(@user)
 
-      page.should have_content("100.0 €")
+      expect(page).to have_content("100.0 €")
       bip_text @user, :money_custom, "250"
 
       within("#money_custom") do
-        page.should have_content("250.0 €")
+        expect(page).to have_content("250.0 €")
       end
     end
 
@@ -687,10 +716,10 @@ describe "JS behaviour", :js => true do
 
       bip_text @user, :money, "string"
 
-      page.should have_content("Money is not a number")
+      expect(page).to have_content("Money is not a number")
 
       within("#money") do
-        page.should have_content("$100.00")
+        expect(page).to have_content("$100.00")
       end
     end
 
@@ -701,7 +730,19 @@ describe "JS behaviour", :js => true do
       bip_text @user, :money, "240"
 
       within("#money") do
-        page.should have_content("$240.00")
+        expect(page).to have_content("$240.00")
+      end
+    end
+
+    it "should show the new value using the helper after a successful update if original value is nil" do
+      @user.money = nil
+      @user.save!
+      visit user_path(@user)
+
+      bip_text @user, :money, "240"
+
+      within("#money") do
+        expect(page).to have_content("$240.00")
       end
     end
 
@@ -716,7 +757,7 @@ describe "JS behaviour", :js => true do
         JS
 
         text = page.find("##{id} input").value
-        text.should == "100.0"
+        expect(text).to eq("100.0")
       end
     end
 
@@ -738,7 +779,7 @@ describe "JS behaviour", :js => true do
         sleep 1
 
         text = page.find("##{id} input").value
-        text.should == "40"
+        expect(text).to eq("40")
       end
     end
 
@@ -746,19 +787,19 @@ describe "JS behaviour", :js => true do
       @user.save!
       visit double_init_user_path(@user)
 
-      within("#alt_money") { page.should have_content("€100.00") }
+      within("#alt_money") { expect(page).to have_content("€100.00") }
 
       bip_text @user, :money, 58
 
-      within("#alt_money") { page.should have_content("€58.00") }
+      within("#alt_money") { expect(page).to have_content("€58.00") }
     end
 
     it "should keep link after edit with display_with :link_to" do
       @user.save!
       visit users_path
       within("tr#user_#{@user.id} > .name > span") do
-        page.should have_content("Lucia")
-        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+        expect(page).to have_content("Lucia")
+        expect(page).to have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
       end
       id = BestInPlace::Utils.build_best_in_place_id @user, :name
       page.execute_script <<-JS
@@ -767,8 +808,8 @@ describe "JS behaviour", :js => true do
         jQuery("##{id} form").submit();
       JS
       within("tr#user_#{@user.id} > .name > span") do
-        page.should have_content("Maria Lucia")
-        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+        expect(page).to have_content("Maria Lucia")
+        expect(page).to have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
       end
     end
 
@@ -776,8 +817,8 @@ describe "JS behaviour", :js => true do
       @user.save!
       visit users_path
       within("tr#user_#{@user.id} > .name > span") do
-        page.should have_content("Lucia")
-        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+        expect(page).to have_content("Lucia")
+        expect(page).to have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
       end
       id = BestInPlace::Utils.build_best_in_place_id @user, :name
       page.execute_script <<-JS
@@ -786,25 +827,21 @@ describe "JS behaviour", :js => true do
         jQuery("##{id} input[name='name']").blur();
       JS
       within("tr#user_#{@user.id} > .name > span") do
-        page.should have_content("Lucia")
-        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+        expect(page).to have_content("Lucia")
+        expect(page).to have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
       end
     end
 
     describe "display_with using a lambda" do
-
-
       it "should render the money" do
         @user.save!
         visit user_path(@user)
 
         within("#money_proc") do
-          page.should have_content("$100.00")
+          expect(page).to have_content("$100.00")
         end
       end
 
-
-
       it "should show the new value using the helper after a successful update" do
         @user.save!
         visit user_path(@user)
@@ -812,7 +849,7 @@ describe "JS behaviour", :js => true do
         bip_text @user, :money_proc, "240"
 
         within("#money_proc") do
-          page.should have_content("$240.00")
+          expect(page).to have_content("$240.00")
         end
       end
 
@@ -827,7 +864,7 @@ describe "JS behaviour", :js => true do
           JS
 
           text = page.find("##{id} input").value
-          text.should == "100.0"
+          expect(text).to eq("100.0")
         end
       end
 
@@ -847,9 +884,8 @@ describe "JS behaviour", :js => true do
           JS
 
           sleep 1
-
           text = page.find("##{id} input").value
-          text.should == "40"
+          expect(text).to eq("40")
         end
       end
 
@@ -857,6 +893,23 @@ describe "JS behaviour", :js => true do
 
   end
 
+  describe 'value' do
+    it 'should use custom value in input' do
+      @user.save!
+      visit user_path(@user)
+
+      page.find('#money_value .best_in_place').click
+      expect(page).to have_field('money', with: 'Custom Value')
+    end
+    it 'should not use default value in input with value set' do
+      @user.save!
+      visit user_path(@user)
+
+      page.find('#money_value .best_in_place').click
+      expect(page).not_to have_field('money', with: @user.money)
+    end
+  end
+
   it "should display strings with quotes correctly in fields" do
     @user.last_name = "A last name \"with double quotes\""
     @user.save!
@@ -870,11 +923,11 @@ describe "JS behaviour", :js => true do
       JS
 
       text = page.find("##{id} input").value
-      text.should == "A last name \"with double quotes\""
+      expect(text).to eq("A last name \"with double quotes\"")
     end
   end
 
-  it "should allow me to set texts with quotes with sanitize => false" do
+  it 'should texts with quotes with raw => true' do
     @user.save!
 
     retry_on_timeout do
@@ -883,7 +936,24 @@ describe "JS behaviour", :js => true do
       bip_area @user, :description, "A <a href=\"http://google.es\">link in this text</a> not sanitized."
       visit double_init_user_path(@user)
 
-      page.should have_link("link in this text", :href => "http://google.es")
+      expect(page).to have_link("link in this text", :href => "http://google.es")
+    end
+  end
+
+  it "should show the input with not-scaped ampersands with raw => true" do
+    @user.description = "A text with an & and a <b>Raw html</b>"
+    @user.save!
+
+    retry_on_timeout do
+      visit double_init_user_path(@user)
+
+      id = BestInPlace::Utils.build_best_in_place_id @user, :description
+      page.execute_script <<-JS
+        $("##{id}").click();
+      JS
+
+      text = page.find("##{id} textarea").value
+      expect(text).to eq("A text with an & and a <b>Raw html</b>")
     end
   end
 
@@ -896,14 +966,14 @@ describe "JS behaviour", :js => true do
       bip_area @user, :description, "A <a href=\"http://google.es\">link in this text</a> not sanitized."
       visit double_init_user_path(@user)
 
-      page.should have_link("link in this text", :href => "http://google.es")
+      expect(page).to have_link("link in this text", :href => "http://google.es")
 
       id = BestInPlace::Utils.build_best_in_place_id @user, :description
       page.execute_script <<-JS
         $("##{id}").click();
       JS
 
-      page.find("##{id} textarea").value.should eq("A <a href=\"http://google.es\">link in this text</a> not sanitized.")
+      expect(page.find("##{id} textarea").value).to eq("A <a href=\"http://google.es\">link in this text</a> not sanitized.")
     end
   end
 
@@ -919,7 +989,7 @@ describe "JS behaviour", :js => true do
         $("##{id}").click();
       JS
 
-      page.find("##{id} select").value.should eq(%{5' 6"})
+      expect(page.find("##{id} select").value).to eq(%{5' 6"})
     end
   end
 
@@ -941,7 +1011,7 @@ describe "JS behaviour", :js => true do
       sleep 1
 
       @user.reload
-      @user.height.should eq(%{5' 7"})
+      expect(@user.height).to eq(%{5' 7"})
     end
   end
 
@@ -955,7 +1025,7 @@ describe "JS behaviour", :js => true do
       sleep 1
 
       @user.reload
-      @user.last_name.should eq("Other '); alert('hi');")
+      expect(@user.last_name).to eq("Other '); alert('hi');")
     end
   end
 
@@ -969,7 +1039,7 @@ describe "JS behaviour", :js => true do
       sleep 1
 
       @user.reload
-      @user.last_name.should eq("Other \"thing\"")
+      expect(@user.last_name).to eq("Other \"thing\"")
     end
   end
 
@@ -980,7 +1050,7 @@ describe "JS behaviour", :js => true do
       visit user_path(@user)
 
       bip_text @user, :last_name, "<script>alert('hi');</script>"
-      within("#last_name") { page.should have_content("<script>alert('hi');</script>") }
+      within("#last_name") { expect(page).to have_content("<script>alert('hi');</script>") }
 
       visit user_path(@user)
 
@@ -989,7 +1059,7 @@ describe "JS behaviour", :js => true do
         $("##{id}").click();
       JS
 
-      page.find("##{id} input").value.should eq("<script>alert('hi');</script>")
+      expect(page.find("##{id} input").value).to eq("<script>alert('hi');</script>")
     end
   end
 
@@ -997,7 +1067,7 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
     within("#country") do
-      page.should have_content("Italy")
+      expect(page).to have_content("Italy")
     end
 
     id = BestInPlace::Utils.build_best_in_place_id @user, :country
@@ -1005,14 +1075,14 @@ describe "JS behaviour", :js => true do
       $("##{id}").click();
     JS
 
-    page.should have_css("##{id} select option[value='2'][selected='selected']")
+    expect(page).to have_css("##{id} select option[value='2'][selected='selected']")
   end
 
   it "should generate the select with the proper current option without reloading the page" do
     @user.save!
     visit user_path(@user)
     within("#country") do
-      page.should have_content("Italy")
+      expect(page).to have_content("Italy")
     end
 
     bip_select @user, :country, "France"
@@ -1023,6 +1093,6 @@ describe "JS behaviour", :js => true do
       $("##{id}").click();
     JS
 
-    page.should have_css("##{id} select option[value='4'][selected='selected']")
+    expect(page).to have_css("##{id} select option[value='4'][selected='selected']")
   end
 end