lookout-rack-test 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGM2N2IwZjk2NTliNDk3ZDMwYTNlMDI3ODBkNDZmYzhhMGRmMTQ4Ng==
+    ZGI4YjI5MmQxZjVhMWNhNDJlZDQxYWIwOGZiMzk0YzU0NzAwYzM0MA==
   data.tar.gz: !binary |-
-    NTk2MzA5ZDJlNWU5ZGY5MGY2NDc1NzFkNmIxNmYzNWRkYjNhYzE2OQ==
+    ZjlhMzVlOGE3ZWU4Mzc3MTc1YTcxNGE5MmM5ZTc0ZmIzY2Y4MDFjYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWUxMDBjYjFmOTIxZmEyM2YyNTliODcxOGNkY2NjMGQ5NmJmNWYwY2MyZWYz
-    ODBjNzg0OGFkMmI0MTJlZmEwMDcxYWFkOTIzODk2NDczOGFiMGNkZjQ2OGVl
-    OGYxOGU2ZjJmMTI3ODUyMzRiNjczMzNiNTU3YTVjMDE4MjFmNzA=
+    N2I3Y2RjMjNmNDE0YjJhNWRhZWI4MWY3YTRmZmEwNmRjY2RmOTFlMGFlZjFi
+    MmUxZjhlODAyN2YyMjVhODY0NTIyZjVhYWQ5OTU5YTQ1NzE3YWU2YjNiM2E0
+    Njg2MzdjMDZiZDQ2ZWQwZTM1ZGI2YTI3ZTg3NjA3MmIzMzg5Yjc=
   data.tar.gz: !binary |-
-    OWU2OGJiMmY2YzkyYjQzZDUyMTdmYzNlZDVmYzg3MzI2ZWIzNGU5NzM0Y2I0
-    ZGRlNDZjMjhiMTE4YjM0MzY0ODBlOWM2ZWRlNWY3YmRlOGQ0ZWI4MzI5MDdk
-    ZjVkMWZmYTdmODYxYWY5YWVjZmUzZTIxMDk2MzcwZTM5Mzk0MmE=
+    ZTZiYTg1MzQyOWVjMDUzMzQxOWQ4YzIzNTc3ZDhhOGY4ODBiOTg3ZDMwYjE4
+    ZDU1M2E5MWRiMjI0NGE2ODY0MWUxNWRiODU0NjdlZTBiODA3YzkwZWQ1OTYx
+    MDU5ZDcxYjBmNzAxYzM5YWNiZmM3YTEwMmM2Nzg4NjkzZWUxOTI=

data/features/support/env.rb

@@ -4,7 +4,7 @@ require 'lookout/rack/test/cucumber'
 
 # Set up TestApp server
 require 'examples/test_app'
-$application_class = TestApp
+Lookout::Rack::Test.app = TestApp
 require 'lookout/rack/test/cucumber/server'
 
 require 'lookout/rack/test/cucumber/transforms'

data/lib/lookout/rack/test/cucumber/server.rb

@@ -1,9 +1,13 @@
 require 'rack/test'
+require 'lookout/rack/test'
 
 module Lookout::Rack::Test::Cucumber
   module Server
     def app
-      @app ||= $application_class.new if $application_class
+      return @app if @app
+
+      klass = ::Lookout::Rack::Test.app || $application_class
+      @app = klass.new if klass
     end
   end
 end

data/lib/lookout/rack/test/cucumber.rb

@@ -7,10 +7,12 @@ require 'lookout/rack/test/cucumber/transforms'
 require 'lookout/rack/test/cucumber/general_steps'
 require 'lookout/rack/test/cucumber/before'
 
-require 'lookout/rack/test/cucumber/server' if $application_class
+require 'lookout/rack/test/cucumber/server'
 
 module Lookout::Rack::Test
   module Cucumber
+    include Lookout::Rack::Test::Cucumber::Server
+
     def render_string(buffer, opts={})
       ::Liquid::Template.parse(buffer).render(template_vars.merge(opts))
     end
@@ -22,10 +24,6 @@ module Lookout::Rack::Test
     def current_locale
       I18n.locale = ENV['CUCUMBER_LOCALE'] || 'en'
     end
-
-    def app
-      @app ||= $application_class.new if $application_class
-    end
   end
 end
 

data/lib/lookout/rack/test/rspec/route_helper.rb

@@ -1,7 +1,12 @@
+require 'lookout/rack/test'
+
 module Lookout::Rack::Test::RSpec
     module RouteHelper
       def app
-        @app ||= $application_class.new if $application_class
+        return @app if @app
+
+        klass = ::Lookout::Rack::Test.app || $application_class
+        @app = klass.new
       end
     end
 end

data/lib/lookout/rack/test/rspec.rb

@@ -38,7 +38,7 @@ module Lookout
             c.include(::Rack::Test::Methods, :type => :route)
   
             require 'lookout/rack/test/rspec/route_helper'
-            $application_class = application
+            ::Lookout::Rack::Test.app = application
             c.include(::RouteHelper, :type => :route)
           end
         end

data/lib/lookout/rack/test/version.rb

@@ -1,7 +1,7 @@
 module Lookout
   module Rack
     module Test
-      VERSION = "1.1.0"
+      VERSION = "1.2.0"
     end
   end
 end

data/lib/lookout/rack/test.rb

@@ -3,6 +3,15 @@ require 'lookout/rack/test/version'
 module Lookout
   module Rack
     module Test
+      @@app = nil
+ 
+      def self.app=(application_class)
+        @@app = application_class
+      end
+
+      def self.app
+        @@app
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lookout-rack-test
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ian Smith