RubyGems - teabag - Versions diffs - 0.5.0 → 0.5.1 - Mend

teabag 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (219) hide show

data/README.md CHANGED Viewed

@@ -71,19 +71,15 @@ Here's a great [Quick Start Walkthrough](https://github.com/modeset/teabag/wiki/
 http://localhost:3000/teabag
 ```
-### Rake
-```
-rake teabag
-```
+You can focus tests in various ways (and we might be providing an interface for this eventually). We already provide a way to switch suites, but to run a specific file you can specify the file(s) to focus to with `/teabag?file[]=file1.js&file[]=file2.js` or `/teabag?file=file1.js`. To specify a match for the test description you can use `/teabag?grep=Calculator should add two digits`
-Specify the suite by using:
+### Rake
 ```
 rake teabag suite=my_fantastic_suite
 ```
-### CLI
+### Command Line Interface
 The command line interface requires a teabag_env.rb file that you can get by running the generator. This file is used to load the Rails environment so Teabag can run within the context of Rails.
@@ -91,22 +87,24 @@ The command line interface requires a teabag_env.rb file that you can get by run
 bundle exec teabag
 ```
-Specify the suite by using:
+The CLI provides several ways of focusing tests. You can specify the suite to run, the files to run, and a filter.
 ```
 bundle exec teabag --suite=my_fantastic_suite
+bundle exec teabag spec/javascripts/file1.js
+bundle exec teabag --filter="Calculator should add two digits"
 ```
-Get full command line help:
+Teabag also has support for [tapout](https://github.com/rubyworks/tapout). Use the tap_y formatter and pipe the results to tapout to use any of the reporters that tapout provides.
 ```
-bundle exec teabag --help
+bundle exec teabag -q --format=tap_y | tapout progress
 ```
-Teabag also has support for [tapout](https://github.com/rubyworks/tapout). Use the tap_y formatter and pipe the results to tapout to use any of the reporters that tapout provides.
+Get full command line help:
 ```
-bundle exec teabag -q --format=tap_y | tapout progress
+bundle exec teabag --help
 ```
 **Note:** By default the rake task and command line interface run within the development environment, but you can specify the environment using `RAILS_ENV=test rake teabag`. This is to stay consistent with what you might see in the browser (since that's likely running in development).
@@ -321,7 +319,7 @@ These configuration directives are applicable only when running via the rake tas
 #### `driver`
-Allows you to specify which driver you want to run your specs with -- Supports [PhantomJS](http://phantomjs.org/) and [Selenium Webdriver](http://seleniumhq.org/docs/03_webdriver.jsp). Check this wiki article for information about [Using Selenium WebDriver](https://github.com/modeset/teabag/wiki/Using-Selenium-WebDriver), and this one if you're having issues with [PhantomJS on Linux](https://github.com/modeset/teabag/wiki/PhantomJS-on-Linux).
+Allows you to specify which driver you want to run your specs with -- Supports [PhantomJS](http://phantomjs.org/) and [Selenium Webdriver](http://seleniumhq.org/docs/03_webdriver.jsp). Check this wiki article for information about [Using Selenium WebDriver](https://github.com/modeset/teabag/wiki/Using-Selenium-WebDriver), and this one about [Using PhantomJS](https://github.com/modeset/teabag/wiki/Using-PhantomJS).
 Available: phantomjs, selenium

data/app/views/teabag/spec/index.html.erb CHANGED Viewed

@@ -2,16 +2,18 @@
 <html>
   <head>
     <title>Teabag :: Javascript Test Runner</title>
-    <%= stylesheet_link_tag_for_teabag *@suite.stylesheets %>
-    <%= csrf_meta_tags %>
     <meta name="viewport" content="width=device-width, user-scalable=no">
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag_for_teabag *@suite.stylesheets %>
     <%= javascript_include_tag_for_teabag *@suite.core_javascripts %>
     <script type="text/javascript">
       // pass relevant info to javascript
       Teabag.version = <%=raw Teabag::VERSION.inspect %>;
       Teabag.root = <%=raw Teabag.configuration.mount_at.inspect %>;
       Teabag.suites = <%=raw @suite.suites.to_json %>;
+    </script>
+    <%= javascript_include_tag_for_teabag *@suite.spec_javascripts %>
+    <script type="text/javascript">
       // start the execution of the specs (on onload, handling existing onload events)
       window.originalOnload = window.onload;
       window.onload = function() {
@@ -20,7 +22,6 @@
         Teabag.execute();
       }
     </script>
-    <%= javascript_include_tag_for_teabag *@suite.spec_javascripts %>
   </head>
   <body>
   </body>

data/lib/teabag/drivers/phantomjs_driver.rb CHANGED Viewed

@@ -5,16 +5,10 @@ module Teabag
   module Drivers
     class PhantomjsDriver < BaseDriver
-      # inject into phantomjs to override the bin path
-      Phantomjs.send :extend, Module.new do
-        def get_executable
-          Teabag.configuration.phantomjs_bin
-        end
-      end if Teabag.configuration.phantomjs_bin.present?
       def run_specs(suite, url)
         runner = Teabag::Runner.new(suite)
+        Phantomjs.instance_variable_set(:@executable, Teabag.configuration.phantomjs_bin)
         Phantomjs.run(script, url) do |line|
           runner.process(line)
         end

data/lib/teabag/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Teabag
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

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

@@ -0,0 +1,27 @@
+#= require integration/spec_helper
+describe "Integration tests", ->
+  it "tests", ->
+    expect(true).toBe(true)
+  it "handles multiple specs", ->
+    expect(true).toBe(true)
+  it "allows failing specs", ->
+    expect(true).toBe(false)
+  describe "nesting", ->
+    it "is allowed", ->
+      expect(true).toBe(true)
+  describe "pending", ->
+    it "is allowed"
+  describe "fixtures", ->
+    it "loads files", ->
+      fixture.load("fixture.html")
+      expect(fixture.el.innerHTML).toContain("Lorem ipsum dolor")

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

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

data/spec/dummy/config/application.rb CHANGED Viewed

@@ -44,6 +44,9 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
+    config.session_store :cookie_store, key: '_dummy_session'
+    config.secret_token = 'bc510a13d2fb96575782e90e9f2f64afc0ba4e63e5869b6139613686f104d4d3dd92ee696468de5bcbbb74daedb702d3da97554efbc6792abe75091b9df0a2ab'
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -51,4 +54,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end

data/spec/dummy/config/initializers/teabag.rb CHANGED Viewed

@@ -4,6 +4,7 @@ Teabag.setup do |config|
   config.asset_paths << Teabag::Engine.root.join('lib/teabag')
   config.suite do |suite|
+    suite.matcher = "{spec/javascripts,spec/dummy/app/assets/javascripts/specs}/**/*_spec.{js,js.coffee,coffee}"
     suite.javascripts = ["teabag/jasmine"]
   end

data/spec/dummy/config/routes.rb CHANGED Viewed

@@ -1,58 +1,3 @@
 Dummy::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-  # See how all your routes lay out with "rake routes"
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  #root to: "application#test"
 end