Use standard RSpec expect() matchers instead of Wrong

Wrong 0.7.1 raises an exception when loading the `close_to`
matcher. Running specs with `bundle exec` tends to fix
this, but that feels kinda accidental.

You probably still need `bundle exec` if you have multiple
versions of any gem (rake, tilt) installed locally.

Fixes railsbridge#479

Author: tjgrathwell

Gemfile

@@ -22,7 +22,6 @@ gem 'jquery-cdn'
 gem 'sprockets'
 
 group :development do
-  gem "wrong", "~> 0.7.0"
   gem "rspec"
   gem "rerun"
   gem "rake"

Gemfile.lock

@@ -52,7 +52,6 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     polyglot (0.3.5)
-    predicated (0.2.6)
     rack (1.6.0)
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
@@ -81,14 +80,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    ruby2ruby (2.1.4)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.6.6)
-      sexp_processor (~> 4.1)
     rubyzip (1.1.7)
     sass (3.4.13)
-    sexp_processor (4.5.0)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -115,12 +108,6 @@ GEM
     trollop (2.1.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    wrong (0.7.1)
-      diff-lcs (~> 1.2.5)
-      predicated (~> 0.2.6)
-      ruby2ruby (>= 2.0.1)
-      ruby_parser (>= 3.0.1)
-      sexp_processor (>= 4.0)
 
 PLATFORMS
   ruby
@@ -150,4 +137,3 @@ DEPENDENCIES
   sinatra-contrib (~> 1.4.0)
   sprockets
   thin
-  wrong (~> 0.7.0)

app.rb

@@ -9,9 +9,6 @@
 require 'zip'
 require 'tmpdir'
 
-#require 'wrong'
-#include Wrong::D
-
 here = File.expand_path File.dirname(__FILE__)
 lib = File.expand_path "#{here}/lib"
 $: << lib

spec/app_deck_spec.rb

@@ -9,7 +9,7 @@
   # todo: move to shared module
   def get! *args
     get *args
-    assert { last_response.status == 200 }
+    expect(last_response.status).to eq(200)
   end
 
   def app
@@ -45,19 +45,19 @@ def app
     it "renders a deck" do
       get! "/meals/breakfast"
       # rendered_breakfast = Deck::SlideDeck.new(:slides => Deck::Slide.split(@breakfast)).to_pretty  # for some reason it's not rendering pretty from the app even though the app uses .to_pretty
-      assert { last_response.body.include? "Raisin Bran" }
+      expect(last_response.body).to include("Raisin Bran")
     end
 
     # todo: include deck.js source right inside the HTML
     it "serves up deck.js and other public assets" do
       get! "/deck.js/core/deck.core.js"
-      assert { last_response.body.include?("Deck JS - deck.core")}
+      expect(last_response.body).to include("Deck JS - deck.core")
 
       get! "/deck.js/jquery-1.7.2.min.js"
-      assert { last_response.body.include?("jQuery v1.7.2 jquery.com")}
+      expect(last_response.body).to include("jQuery v1.7.2 jquery.com")
 
       get! "/assets/application.css"
-      assert { last_response.body.include?("/* Code ray css */")}
+      expect(last_response.body).to include("/* Code ray css */")
     end
   end
 end

spec/app_spec.rb

@@ -32,32 +32,32 @@ def true_app
   def get! *args
     get *args
     follow_redirect! while last_response.redirect?
-    assert { last_response.status == 200 }
+    expect(last_response.status).to eq(200)
   end
 
   it "is a sinatra app" do
     get '/'
-    assert { true_app.is_a? InstallFest }
-    assert { true_app.class.ancestors.include? Sinatra::Application }
+    expect(true_app).to be_a(InstallFest)
+    expect(true_app.class.ancestors).to include(Sinatra::Application)
   end
 
   it "redirects / to the default site" do
     get! "/"
-    assert { last_request.path == "/docs/" }
+    expect(last_request.path).to eq("/docs/")
   end
 
   it "redirects /site to /site/" do
     get! "/installfest"
-    assert { last_request.path == "/installfest/" }
+    expect(last_request.path).to eq("/installfest/")
   end
 
   it "redirects /site/page/ to /site/page" do
     get! "/installfest/linux/"
-    assert { last_request.path == "/installfest/linux" }
+    expect(last_request.path).to eq("/installfest/linux")
   end
 
   it "has a default site" do
-    assert { true_app.default_site == "docs" }
+    expect(true_app.default_site).to eq("docs")
   end
 
   describe "settings" do
@@ -68,23 +68,23 @@ def get! *args
     describe "learns the locale from" do
       it "the locale parameter" do
         true_app.params = {locale: 'es'}
-        assert { true_app.dynamic_locale == 'es' }
+        expect(true_app.dynamic_locale).to eq('es')
       end
 
       it "the l parameter" do
         true_app.params = {l: 'es'}
-        assert { true_app.dynamic_locale == 'es' }
+        expect(true_app.dynamic_locale).to eq('es')
       end
 
       it "the subdomain" do
         true_app.request = Rack::Request.new({"HTTP_HOST" => "es.example.com"})
-        assert { true_app.dynamic_locale == 'es' }
+        expect(true_app.dynamic_locale).to eq('es')
       end
 
       it "the SITE_LOCALE environment var" do
         begin
           ENV["SITE_LOCALE"] = "es"
-          assert { true_app.dynamic_locale == 'es' }
+          expect(true_app.dynamic_locale).to eq('es')
         ensure
           ENV["SITE_LOCALE"] = nil
         end
@@ -94,17 +94,17 @@ def get! *args
 
   it "looks for a site named the same as the host" do
     get "/", {}, {"HTTP_HOST" => "docs.example.com"}
-    assert { last_response.redirect? }
+    expect(last_response).to be_redirect
     follow_redirect! while last_response.redirect?
-    assert { last_request.path == "/docs/" }
+    expect(last_request.path).to eq("/docs/")
   end
 
   describe "in the 'es' locale" do
     it "uses the 'es' subdir as the sites_dir" do
       get "/", locale: "es"
 
       es_dir = File.expand_path(File.join(__FILE__, "..", "..", "sites", "es"))
-      assert { true_app.sites_dir == es_dir }
+      expect(true_app.sites_dir).to eq(es_dir)
     end
 
   end

spec/media_wiki_spec.rb

@@ -5,9 +5,7 @@
 
 describe "mw2md" do
   it "converts [[]]" do
-    assert {
-      mw2md("[[OS X 10.7 (Lion)]]") == "[OS X 10.7 Lion](os_x_10_7_lion)"
-    }
+    expect(mw2md("[[OS X 10.7 (Lion)]]")).to eq("[OS X 10.7 Lion](os_x_10_7_lion)")
   end
 end
 

spec/site_syntax_spec.rb

@@ -41,10 +41,10 @@ def app
               end
 
               last_response_status = last_response.status
-              assert { last_response_status == 200 }
+              expect(last_response_status).to eq(200)
 
               if doc.filename.end_with?('.step')
-                assert { last_response.body !~ /FUZZY/ }
+                expect(last_response.body).not_to match(/FUZZY/)
               end
             end
           end

spec/spec_helper.rb

@@ -3,15 +3,14 @@
 $: << "#{top}/lib"
 
 require "rspec"
-require "wrong/adapters/rspec"
 require "nokogiri"
 require "files"
 require 'active_support/core_ext/string/strip'
 
 Dir[File.join(top, "spec/support/**/*.rb")].each {|f| require f}
 
 def assert_loosely_equal lhs, rhs
-  assert { lhs.gsub(/\n\s*/, '') == rhs.gsub(/\n\s*/, '') }
+  expect(lhs.gsub(/\n\s*/, '')).to eq(rhs.gsub(/\n\s*/, ''))
 end
 
 RSpec.configure do |c|

spec/step_spec.rb

@@ -35,14 +35,14 @@ def step_obj_for(path)
       <h1>#{checkbox_html}<span class="prefix">Step 1: </span>hello</h1>
       </div>
     HTML
-    assert { html == expected }
+    expect(html).to eq(expected)
   end
 
   it "puts anchors in based on step numbers" do
     steps = html_doc.css(".step")
     steps.each_with_index do |step, i|
-      assert { step.previous }
-      assert { to_html(step.previous) == "<a name=\"step#{i+1}\"></a>" }
+      expect(step.previous).to be_truthy
+      expect(to_html(step.previous)).to eq("<a name=\"step#{i+1}\"></a>")
     end
   end
 
@@ -53,7 +53,7 @@ def step_obj_for(path)
 
     anchors = html_doc.css("a")
     names = anchors.map{|a| a["name"]}
-    assert { names == %w(step1 happy_step) }
+    expect(names).to eq(%w(step1 happy_step))
   end
 
   it "nests anchor numbers" do
@@ -70,7 +70,7 @@ def step_obj_for(path)
 
     anchors = html_doc.css("a")
     names = anchors.map{|a| a["name"]}
-    assert { names == %w(step1 step1-1 step1-2 step2 step2-1 step2-2) }
+    expect(names).to eq(%w(step1 step1-1 step1-2 step2 step2-1 step2-2))
   end
 
   describe 'link' do
@@ -85,7 +85,7 @@ def step_obj_for(path)
         end
       RUBY
       a = html_doc.css(".step a.link").first
-      assert { a["href"] == "choose_breakfast" }
+      expect(a["href"]).to eq("choose_breakfast")
     end
 
     it "has an optional parameter for the caption" do
@@ -94,7 +94,7 @@ def step_obj_for(path)
         link "breakfast", caption: "Eat some"
       end
       RUBY
-      assert { html_doc.css("p.link").text == "Eat some Breakfast" }
+      expect(html_doc.css("p.link").text).to eq("Eat some Breakfast")
     end
   end
 
@@ -103,14 +103,14 @@ def step_obj_for(path)
       html_doc(<<-RUBY)
         source_code "x = 2"
       RUBY
-      assert { @html == "<pre class=\"code\">x = 2</pre>" }
+      expect(@html).to eq("<pre class=\"code\">x = 2</pre>")
     end
 
     it "emits a block of code with a language directive" do
       html_doc(<<-RUBY)
         source_code :ruby, "x = 2"
       RUBY
-      assert { @html == "<pre class=\"code\">\n:::ruby\nx = 2</pre>" }
+      expect(@html).to eq("<pre class=\"code\">\n:::ruby\nx = 2</pre>")
     end
   end