teaspoon 0.7.9 → 0.8.0

data/lib/teaspoon/utility.rb

@@ -4,28 +4,17 @@ module Teaspoon
     # Cross-platform way of finding an executable in the $PATH.
     # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
     #
-    # @example
-    #   which('ruby') #=> /usr/bin/ruby
-    #
-    # @param cmd [String] the executable to find
-    # @return [String, nil] the path to the executable
-    #
     def which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
 
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
-          exe = "#{ path }/#{ cmd }#{ ext }"
+          exe = "#{path}/#{cmd}#{ext}"
           return exe if File.executable?(exe)
         end
       end
 
       nil
     end
-
-    def istanbul()
-      # find istanbul in path or local npm install
-      which("istanbul") || (File.executable?("./node_modules/.bin/istanbul") ? "./node_modules/.bin/istanbul" : nil)
-    end
   end
 end

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

data/spec/dummy/app/assets/javascripts/integration/integration_spec.coffee

@@ -13,6 +13,9 @@ describe "Integration tests", ->
   it "allows failing specs", ->
     expect(true).toBe(false)
 
+  it "allows erroring specs", ->
+    foo()
+
   describe "nesting", ->
 
     it "is allowed", ->

data/spec/dummy/app/assets/javascripts/integration/spec_helper.coffee

@@ -3,3 +3,5 @@ window.onload = ->
   el.id = "spec_helper_el"
   el.innerHTML = "this was generated by the spec_helper"
   document.body.appendChild(el)
+
+foo = foo()

data/spec/dummy/config/application.rb

@@ -26,5 +26,8 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    config.relative_url_root = "/relative"
+    config.assets.prefix = "/relative/assets" # this must be set for any asset paths to be correct!
   end
 end

data/spec/features/console_reporter_spec.rb

@@ -3,31 +3,61 @@ require "spec_helper"
 feature "testing with teaspoon in the console", aruba: true do
 
   scenario "gives me the expected results" do
-    run_simple("bundle exec teaspoon -r ../../spec/teaspoon_env --suite=default app/assets/javascripts/integration/integration_spec.coffee", false)
+    run_simple("bundle exec teaspoon -r ../../spec/teaspoon_env.rb --suite=default app/assets/javascripts/integration/integration_spec.coffee", false)
 
-    assert_partial_output("..F.*.", all_output)
-    assert_partial_output("testing console output", all_output)
-    assert_partial_output("6 examples, 1 failure, 1 pending", all_output)
-    assert_partial_output('teaspoon -s default --filter="Integration tests allows failing specs."', all_output)
+    expected = <<-OUTPUT.strip_heredoc
+    Teaspoon running default suite at http://127.0.0.1:31337/teaspoon/default
+    TypeError: 'undefined' is not a function (evaluating 'foo()')
+      # http://127.0.0.1:31337/relative/assets/integration/spec_helper.js:12
+      # http://127.0.0.1:31337/relative/assets/integration/spec_helper.js:14
 
-    expected = <<-OUTPUT
-Pending:
-  Integration tests pending is allowed
-    # Not yet implemented
+    testing console output
+    ..FF.*.
 
-Failures:
+    Pending:
+      Integration tests pending is allowed
+        # Not yet implemented
 
-  1) Integration tests allows failing specs
-     Failure/Error: Expected true to be false.
+    Failures:
+
+      1) Integration tests allows failing specs
+         Failure/Error: Expected true to be false.
+
+      2) Integration tests allows erroring specs
+         Failure/Error: ReferenceError: Can't find variable: foo in http://127.0.0.1:31337/relative/assets/integration/integration_spec.js?body=1 (line 14)
+
+    Finished in 0.31337 seconds
+    7 examples, 2 failures, 1 pending
+
+    Failed examples:
+
+    teaspoon -s default --filter="Integration tests allows failing specs."
+    teaspoon -s default --filter="Integration tests allows erroring specs."
     OUTPUT
-    assert_partial_output(expected, all_output)
+    output = all_output.gsub(/Finished in [\d\.]+ seconds/, "Finished in 0.31337 seconds")
+    output = output.gsub(/127\.0\.0\.1:\d+/, "127.0.0.1:31337")
+    assert_partial_output(expected, output)
   end
 
-  scenario "displays coverage information" do
-    pending "broken with rails 4"
-    pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.istanbul()
-    run_simple("bundle exec teaspoon -r ../../spec/teaspoon_env --suite=default app/assets/javascripts/integration/integration_spec.coffee --coverage-reports=text", false)
+  describe "with coverage" do
+
+    scenario "displays coverage information" do
+      pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.executable
+      pending("needs to be figured out")
+      # for some reason when loaded in the specs the instrumentation isn't working, though it is working in practice
+      #   confirmed that no data is coming through to Teaspoon::Coverage in the result reported by the console reporter
+      #   confirmed that instrument=true is being added to the asset source urls
+      # which means that our sprockets/rack shim doesn't work in this environment
+      run_simple("bundle exec teaspoon -r ../../spec/teaspoon_env.rb --coverage=default app/assets/javascripts/integration/integration_spec.coffee", false)
+
+      assert_partial_output("=============================== Coverage summary ===============================", all_output)
+      assert_partial_output("Statements   : 92.31% ( 12/13 )", all_output)
+      assert_partial_output("Branches     : 100% ( 0/0 )", all_output)
+      assert_partial_output("Functions    : 75% ( 3/4 )", all_output)
+      assert_partial_output("Lines        : 92.31% ( 12/13 )", all_output)
+      assert_partial_output("================================================================================", all_output)
+    end
 
-    assert_partial_output("|   % Stmts |% Branches |   % Funcs |   % Lines |", all_output)
   end
+
 end

data/spec/features/hooks_spec.rb

@@ -5,61 +5,43 @@ require "fileutils"
 feature "testing hooks in the browser" do
   include Rack::Test::Methods
 
-  before do
-    Teaspoon.configuration.stub(:suites).and_return "before_hooks" => proc{ |suite|
-      suite.hook :before do
-        File.write('tmp/before_hook_test' , '')
-      end
-    }
-  end
-
-  let(:temp_file) { 'tmp/before_hook_test' }
-
-  def app
-    Dummy::Application
-  end
+  let(:app) { Dummy::Application }
+  let(:suites) {{
+    "suite1" => {block: proc{ |suite| suite.hook :before, &proc{ File.write(temp_file, "") } }},
+    "suite2" => {block: proc{ |suite| suite.hook :after, &proc{ File.write(temp_file, "") } }}
+  }}
 
   before do
-    FileUtils.mkdir 'tmp' unless File.directory?('tmp')
+    Teaspoon.configuration.stub(:suite_configs).and_return(suites)
+    FileUtils.mkdir_p('tmp')
     File.delete(temp_file) if File.exists?(temp_file)
-  end
-
-  scenario "gives me the expected results" do
     expect(File.exists?(temp_file)).to eql(false)
+  end
 
-    post "/teaspoon/before_hooks/hooks/before"
-
-    expect(File.exists?(temp_file)).to eql(true)
+  after do
+    File.delete(temp_file) if File.exists?(temp_file)
   end
-end
 
-feature "testing after hooks in the browser" do
-  include Rack::Test::Methods
+  describe "requesting a before hook by name (using POST)" do
 
-  before do
-    Teaspoon.configuration.stub(:suites).and_return "default" => proc{ |suite|
-      suite.hook :default do
-        File.write('tmp/default_hook_test', '')
-      end
-    }
-  end
+    let(:temp_file) { "tmp/before_hook_test" }
 
-  let(:temp_file) { 'tmp/default_hook_test' }
+    scenario "gives me the expected results" do
+      post("/teaspoon/suite1/before")
+      expect(File.exists?(temp_file)).to be_true
+    end
 
-  def app
-    Dummy::Application
   end
 
-  before do
-    FileUtils.mkdir 'tmp' unless File.directory?('tmp')
-    File.delete(temp_file) if File.exists?(temp_file)
-  end
+  describe "requesting an after hook by name (using GET)" do
 
-  scenario "gives me the expected results" do
-    expect(File.exists?(temp_file)).to eql(false)
+    let(:temp_file) { "tmp/after_hook_test" }
 
-    post "/teaspoon/default/hooks"
+    scenario "gives me the expected results" do
+      post("/teaspoon/suite2/after")
+      expect(File.exists?(temp_file)).to be_true
+    end
 
-    expect(File.exists?(temp_file)).to eql(true)
   end
+
 end

data/spec/features/html_reporter_spec.rb

@@ -2,15 +2,17 @@ require "spec_helper"
 
 feature "testing with teaspoon in the browser", js: true do
 
+  let(:spec_helper) { nil }
+
   before do
-    Teaspoon.configuration.stub(:suites).and_return "integration" => proc{ |suite|
+    Teaspoon.configuration.stub(:suite_configs).and_return "integration" => {block: proc{ |suite|
       suite.matcher = "spec/dummy/app/assets/javascripts/integration/*_spec.{js,js.coffee,coffee}"
-      suite.helper = nil
-    }
+      suite.helper = spec_helper
+    }}
   end
 
   scenario "gives me the expected results" do
-    visit "/teaspoon/integration?reporter=HTML"
+    visit "/teaspoon/integration"
 
     within("#teaspoon-progress") do
       expect(find("em")).to have_text("100%")
@@ -18,36 +20,51 @@ feature "testing with teaspoon in the browser", js: true do
 
     within("#teaspoon-stats") do
       expect(find("li:nth-child(1)")).to have_text("passes: 4")
-      expect(find("li:nth-child(2)")).to have_text("failures: 1")
+      expect(find("li:nth-child(2)")).to have_text("failures: 2")
       expect(find("li:nth-child(3)")).to have_text("skipped: 1")
     end
 
     within("#teaspoon-report-failures") do
-      expect(find("li.spec")).to have_text("Integration tests allows failing specs.")
+      expect(find("li.spec:first-child")).to have_text("Integration tests allows failing specs.")
     end
 
     expect(find("#spec_helper_el")).to have_text("this was generated by the spec_helper")
   end
-end
 
-feature "testing with teaspoon in the browser with turbolinks", js: true do
-  before do
-    Teaspoon.configuration.stub(:suites).and_return "integration" => proc{ |suite|
-      suite.matcher = "spec/dummy/app/assets/javascripts/integration/*_spec.{js,js.coffee,coffee}"
-      suite.helper = "turbolinks_helper"
-    }
-  end
+  describe "toggle buttons" do
 
-  scenario "executes teaspoon in each page navigation" do
-    visit "/teaspoon/integration?reporter=HTML"
-    within("#teaspoon-progress") do
-      expect(find("em")).to have_text("100%")
+    scenario "progress toggle button toggles progress display" do
+      visit "/teaspoon/integration?reporter=HTML"
+
+      find("#teaspoon-display-progress").click
+      expect(page).not_to have_text("100%")
+
+      find("#teaspoon-display-progress").click
+      expect(page).to have_text("100%")
     end
 
-    find("#teaspoon-report-failures li.spec a").click
+  end
 
-    within("#teaspoon-progress") do
-      expect(find("em")).to have_text("100%")
+  describe "using turbolinks doesn't break things" do
+
+    let(:spec_helper) { "turbolinks_helper" }
+
+    scenario "executes in each page navigation" do
+      visit "/teaspoon/integration"
+
+      within("#teaspoon-progress") do
+        expect(find("em")).to have_text("100%")
+      end
+
+      within("#teaspoon-report-failures") do
+        find("li.spec:first-child a").click
+      end
+
+      within("#teaspoon-progress") do
+        expect(find("em")).to have_text("100%")
+      end
     end
+
   end
+
 end

data/spec/features/install_generator_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-feature "installing teaspoon with the generator", aruba: true do
+feature "Installation", aruba: true do
 
   before do
     unset_bundler_env_vars
@@ -10,32 +10,46 @@ feature "installing teaspoon with the generator", aruba: true do
     run_simple("bundle install --local")
   end
 
-  scenario "installs the basic files" do
-    run_simple("bundle exec rails generate teaspoon:install --trace")
-    expected = <<-OUTPUT
-      create  config/initializers/teaspoon.rb
+  describe "running the generator" do
+
+    scenario "installs the basic files" do
+      run_simple("bundle exec rails generate teaspoon:install --trace")
+
+      expected = <<-OUTPUT
       create  spec/teaspoon_env.rb
       create  spec/javascripts/support
       create  spec/javascripts/fixtures
       create  spec/javascripts/spec_helper.js
-    OUTPUT
-    assert_partial_output(expected, all_output)
-    check_file_presence(["config/initializers/teaspoon.rb"], true)
-    check_file_presence(["spec/teaspoon_env.rb"], true)
-    check_file_presence(["spec/javascripts/spec_helper.js"], true)
+      OUTPUT
+      assert_partial_output(expected, all_output)
+
+      check_file_presence(["spec/teaspoon_env.rb"], true)
+      check_file_presence(["spec/javascripts/spec_helper.js"], true)
+    end
+
   end
 
-  scenario "installs with coffeescript spec helpers" do
-    run_simple("bundle exec rails generate teaspoon:install --trace --coffee")
-    expected = <<-OUTPUT
+  describe "specifying options" do
+
+    scenario "installs with coffeescript spec helpers" do
+      run_simple("bundle exec rails generate teaspoon:install --trace --coffee")
+
+      expected = <<-OUTPUT
       create  spec/javascripts/spec_helper.coffee
-    OUTPUT
-    assert_partial_output(expected, all_output)
-    check_file_presence(["config/initializers/teaspoon.rb"], true)
-  end
+      OUTPUT
+      assert_partial_output(expected, all_output)
+
+      check_file_presence(["spec/teaspoon_env.rb"], true)
+      check_file_presence(["spec/javascripts/spec_helper.coffee"], true)
+    end
+
+    scenario "installs using the mocha framework" do
+      run_simple("bundle exec rails generate teaspoon:install --trace --framework=mocha")
+
+      check_file_content("spec/teaspoon_env.rb", %{    suite.use_framework :mocha}, true)
+      check_file_content("spec/teaspoon_env.rb", %{    #suite.javascripts = ["mocha/1.17.1", "teaspoon-mocha"]}, true)
+    end
 
-  scenario "allows installing using the mocha framework" do
-    run_simple("bundle exec rails generate teaspoon:install --trace --framework=mocha")
-    check_file_content("config/initializers/teaspoon.rb", %{    suite.javascripts = ["teaspoon-mocha"]}, true)
   end
+
 end

data/spec/features/instrumentation_spec.rb

@@ -3,16 +3,17 @@ require "spec_helper"
 feature "instrumenting javascript" do
 
   before do
-    pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.istanbul()
+    pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.executable
   end
 
   scenario "requesting with instrument=true adds istanbul instrumentation" do
-    pending "broken with rails 4"
+    pending("needs to be figured out")
     visit "/assets/instrumented1.js?instrument=true"
     expect(html).to include("if (typeof __coverage__ === 'undefined') { __coverage__ = {}; }")
   end
 
   scenario "requesting without instrument=true doesn't do anything" do
+    pending("needs to be figured out")
     visit "/assets/instrumented2.js?instrument=false"
     expect(html).to_not include("if (typeof __coverage__ === 'undefined') { __coverage__ = {}; }")
   end

data/spec/fixtures/coverage.json

@@ -0,0 +1,243 @@
+{
+  "/Users/jejacks0n/Projects/teaspoon/spec/dummy/app/assets/javascripts/integration/integration.coffee":{
+    "path":"/Users/jejacks0n/Projects/teaspoon/spec/dummy/app/assets/javascripts/integration/integration.coffee",
+    "s":{
+      "1":1,
+      "2":1,
+      "3":1,
+      "4":0
+    },
+    "b":{
+
+    },
+    "f":{
+      "1":1,
+      "2":0
+    },
+    "fnMap":{
+      "1":{
+        "name":"(anonymous_1)",
+        "line":1,
+        "loc":{
+          "start":{
+            "line":1,
+            "column":1
+          },
+          "end":{
+            "line":1,
+            "column":12
+          }
+        }
+      },
+      "2":{
+        "name":"(anonymous_2)",
+        "line":4,
+        "loc":{
+          "start":{
+            "line":4,
+            "column":16
+          },
+          "end":{
+            "line":4,
+            "column":27
+          }
+        }
+      }
+    },
+    "statementMap":{
+      "1":{
+        "start":{
+          "line":1,
+          "column":0
+        },
+        "end":{
+          "line":8,
+          "column":14
+        }
+      },
+      "2":{
+        "start":{
+          "line":2,
+          "column":2
+        },
+        "end":{
+          "line":2,
+          "column":18
+        }
+      },
+      "3":{
+        "start":{
+          "line":4,
+          "column":2
+        },
+        "end":{
+          "line":6,
+          "column":4
+        }
+      },
+      "4":{
+        "start":{
+          "line":5,
+          "column":4
+        },
+        "end":{
+          "line":5,
+          "column":17
+        }
+      }
+    },
+    "branchMap":{
+
+    },
+    "code":[
+      "(function () { (function() {",
+      "  var integration;",
+      "",
+      "  integration = function() {",
+      "    return 'foo';",
+      "  };",
+      "",
+      "}).call(this);",
+      "",
+      "}());"
+    ]
+  },
+  "/Users/jejacks0n/Projects/teaspoon/spec/dummy/app/assets/javascripts/integration/spec_helper.coffee":{
+    "path":"/Users/jejacks0n/Projects/teaspoon/spec/dummy/app/assets/javascripts/integration/spec_helper.coffee",
+    "s":{
+      "1":1,
+      "2":1,
+      "3":1,
+      "4":1,
+      "5":1,
+      "6":1,
+      "7":1
+    },
+    "b":{
+
+    },
+    "f":{
+      "1":1,
+      "2":1
+    },
+    "fnMap":{
+      "1":{
+        "name":"(anonymous_1)",
+        "line":1,
+        "loc":{
+          "start":{
+            "line":1,
+            "column":1
+          },
+          "end":{
+            "line":1,
+            "column":12
+          }
+        }
+      },
+      "2":{
+        "name":"(anonymous_2)",
+        "line":2,
+        "loc":{
+          "start":{
+            "line":2,
+            "column":18
+          },
+          "end":{
+            "line":2,
+            "column":29
+          }
+        }
+      }
+    },
+    "statementMap":{
+      "1":{
+        "start":{
+          "line":1,
+          "column":0
+        },
+        "end":{
+          "line":10,
+          "column":14
+        }
+      },
+      "2":{
+        "start":{
+          "line":2,
+          "column":2
+        },
+        "end":{
+          "line":8,
+          "column":4
+        }
+      },
+      "3":{
+        "start":{
+          "line":3,
+          "column":4
+        },
+        "end":{
+          "line":3,
+          "column":11
+        }
+      },
+      "4":{
+        "start":{
+          "line":4,
+          "column":4
+        },
+        "end":{
+          "line":4,
+          "column":39
+        }
+      },
+      "5":{
+        "start":{
+          "line":5,
+          "column":4
+        },
+        "end":{
+          "line":5,
+          "column":29
+        }
+      },
+      "6":{
+        "start":{
+          "line":6,
+          "column":4
+        },
+        "end":{
+          "line":6,
+          "column":59
+        }
+      },
+      "7":{
+        "start":{
+          "line":7,
+          "column":4
+        },
+        "end":{
+          "line":7,
+          "column":41
+        }
+      }
+    },
+    "branchMap":{
+
+    },
+    "code":[
+      "(function () { (function() {",
+      "  window.onload = function() {",
+      "    var el;",
+      "    el = document.createElement(\"DIV\");",
+      "    el.id = \"spec_helper_el\";",
+      "    el.innerHTML = \"this was generated by the spec_helper\";",
+      "    return document.body.appendChild(el);",
+      "  };",
+      "",
+      "}).call(this);",
+      "",
+      "}());"
+    ]
+  }
+}