alfred_rails 0.0.1.alpha → 0.1.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa092990a0c15473f2de135190053a555556beb
-  data.tar.gz: 4c733b4d2437fc8bcb064be5f7b6e0c45e4a8652
+  metadata.gz: 976e1112306a5facac5cb4bb3bc0e1df28303e6e
+  data.tar.gz: 954dfba138e13b2d45f814c3e1fbdc3a6efa84f1
 SHA512:
-  metadata.gz: 287ec639bca0ca48c0bf5f0690848f8888b271850856f86f6ad2c207a593925c966b16b515bbab5f481256d65a1e5cb807cf0252f292ee151020474485456309
-  data.tar.gz: a92f6780d2ee432c6ec1bf77c44d3db50ed9bf4b0caa89afed01e76f9cb7706231435fa3a4462cc5b4ac5e1fb93e4bdbdcb4c9cce7fa4d742f9889017b0f5041
+  metadata.gz: 0ffe4ca1a72a16cd79212dd25ff6cdcd578102f86c7e1c87320bfbb3ea0d659673ee593a0dfbb8eca4ff4359f72b43e8e9ae45f8aca272b943db1ce8c34716a4
+  data.tar.gz: 4aa5c306df9514a0f5a5cb8e1e740c0276cf5bac947f8831d7e9815f1de625dfd9f38e268bc58dc58a617b1b406f40f0a3e5107500bc6837dc688f0db154f7e7

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in alfred_rails.gemspec
+# Specify your gem's dependencies in alfred.gemspec
 gemspec

data/README.md

@@ -1,16 +1,16 @@
-## Alfred Rails
+## Alfred
 
 [![Gem Version](http://img.shields.io/gem/v/alfred_rails.svg)][gem]
-[![Build Status](http://img.shields.io/travis/jhnvz/alfred_rails.svg)][travis]
-[![Coverage Status](http://img.shields.io/coveralls/jhnvz/alfred_rails.svg)][coveralls]
-[![Code Climate](http://img.shields.io/codeclimate/github/jhnvz/alfred_rails.svg)][codeclimate]
-[![Dependency Status](http://img.shields.io/gemnasium/jhnvz/alfred_rails.svg)][gemnasium]
+[![Build Status](http://img.shields.io/travis/jhnvz/alfred.svg)][travis]
+[![Coverage Status](http://img.shields.io/coveralls/jhnvz/alfred.svg)][coveralls]
+[![Code Climate](http://img.shields.io/codeclimate/github/jhnvz/alfred.svg)][codeclimate]
+[![Dependency Status](http://img.shields.io/gemnasium/jhnvz/alfred.svg)][gemnasium]
 
-[gem]: https://rubygems.org/gems/alfred_rails
-[travis]: http://travis-ci.org/jhnvz/alfred_rails
-[coveralls]: https://coveralls.io/r/jhnvz/alfred_rails
-[codeclimate]: https://codeclimate.com/github/jhnvz/alfred_rails
-[gemnasium]: https://gemnasium.com/jhnvz/alfred_rails
+[gem]: https://rubygems.org/gems/alfred
+[travis]: http://travis-ci.org/jhnvz/alfred
+[coveralls]: https://coveralls.io/r/jhnvz/alfred
+[codeclimate]: https://codeclimate.com/github/jhnvz/alfred
+[gemnasium]: https://gemnasium.com/jhnvz/alfred
 
 Serves controller action responses under several conditions.
 
@@ -38,7 +38,7 @@ Installation
 Defining scenario's
 ------------
 
-You can create empty definitions by running: 
+You can create empty definitions by running:
 ```
 $ rails g alfred:controller api/v1/posts
 ```
@@ -67,10 +67,6 @@ Alfred.define do
       }
     end
   end
-
-  scenario 'update post by manager' do
-    controller Api::V1::PostsController
-  end
 end
 ```
 
@@ -82,6 +78,15 @@ spec/javascripts/fixtures/api/v1/posts/update/update_by_manager.js
 Configuration
 ------------
 
+There are just a few configuration options listed below:
+
+- `include` The modules you want to include in ActionController::TestCase.
+- `setup` Runs before every scenario.
+- `mock_with` Mocking framework of your choise.
+- `fixture_path` Where to save the fixtures.
+
+See example below:
+
 ```ruby
 # spec/alfred_helper.rb
 
@@ -94,17 +99,18 @@ Alfred.configure do |config|
   config.setup do
     Apartment::Database.stub(:create).and_return(true)
   end
-  
+
   ## Mocking framework
   config.mock_with :rspec
-  
+  config.mock_with :mocha
+  config.mock_with :rr
+  config.mock_with :flexmock
+
   ## Fixture path
   config.fixture_path 'spec/javascripts/fixtures'
 end
 ```
 
-Configuration instructions
-
 Javascript testing
 ------------
 

data/{alfred_rails.gemspec → alfred.gemspec}

@@ -1,14 +1,14 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'alfred_rails/version'
+require 'alfred/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "alfred_rails"
   gem.version       = Alfred::VERSION
   gem.authors       = ['Johan van Zonneveld', 'Arjen Oosterkamp']
   gem.email         = ['johan@vzonneveld.nl', 'mail@arjen.me']
-  gem.homepage      = 'https://github.com/jhnvz/alfred_rails.git'
+  gem.homepage      = 'https://github.com/jhnvz/alfred'
   gem.summary       = %q{Serves controller responses under several conditions.}
   gem.description   = %q{Alfred creates fixture files of your controller responses so you can use them in your tests. Ideal if your app's client is build with a javascript framework and you want to test responses under several conditions.}
   gem.license       = 'MIT'
@@ -29,6 +29,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'teaspoon'
   gem.add_development_dependency 'coffee-script'
 
+  gem.add_development_dependency "rr",       "~> 1.0.4"
+  gem.add_development_dependency "flexmock", "~> 0.9.0"
+
   gem.add_dependency 'database_cleaner'
   gem.add_dependency 'ruby-progressbar'
   gem.add_dependency 'ammeter'

data/bin/alfred

@@ -2,5 +2,5 @@
 root = File.expand_path('../../lib', __FILE__)
 $:.unshift(root) unless $:.include?(root)
 
-require "alfred_rails/command_line"
+require "alfred/command_line"
 Alfred::CommandLine.new

data/lib/{alfred_rails → alfred}/command_line.rb

@@ -11,7 +11,7 @@ module Alfred
 
       load_rails!
 
-      require 'alfred_rails'
+      require 'alfred'
       ::Alfred.load!
 
       ::Alfred::Runner.new(@options[:files])

data/lib/{alfred_rails → alfred}/configuration.rb

@@ -125,15 +125,53 @@ module Alfred
       config[:mock_with] = framework
     end
 
+    MOCKING_ADAPTERS = {
+      :rspec    => :RSpec,
+      :flexmock => :Flexmock,
+      :rr       => :RR,
+      :mocha    => :Mocha
+    }
+
+    ##
+    # Returns the mocking adapter module.
+    #
+    # === Example
+    #
+    #   configuration.mock_with :rspec
+    #   configuration.mock_adapter #=> Alfred::MockingAdapters::RSpec
+    #
+    # === Returns
+    #
+    #   [module (Module)] the adapter
+    #
+    def mock_adapter
+      adapter = MOCKING_ADAPTERS[mock_with]
+      "Alfred::MockingAdapters::#{adapter}".constantize
+    end
+
     private
 
       ##
-      # Wheter rspec is defined.
+      # Wheter module is defined.
       #
+      # :nocov:
       def rspec_defined?
         defined?(RSpec)
       end
 
+      def mocha_defined?
+        defined?(Mocha)
+      end
+
+      def rr_defined?
+        defined?(RR)
+      end
+
+      def flexmock_defined?
+        defined?(Flexmock)
+      end
+      # :nocov:
+
       ##
       # Loads defaults based on defined constants.
       # It guesses fixture_path and mocking framework.
@@ -148,8 +186,12 @@ module Alfred
         ## Guess mocking framework
         @config[:mock_with] = if rspec_defined?
           :rspec
-        else
-          :test_unit
+        elsif mocha_defined?
+          :mocha
+        elsif rr_defined?
+          :rr
+        elsif flexmock_defined?
+          :flexmock
         end
       end
 

data/lib/alfred/mocking_adapters/flexmock.rb

@@ -0,0 +1,24 @@
+#  Created by Jim Weirich on 2007-04-10.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'flexmock/rspec'
+
+module Alfred
+  module MockingAdapters
+    module Flexmock
+
+      include ::FlexMock::MockContainer
+
+      def setup_mocks
+        # No setup required
+      end
+
+      def teardown_mocks
+        flexmock_verify
+      ensure
+        flexmock_close
+      end
+
+    end # Flexmock
+  end # MockingAdapters
+end # Alfred

data/lib/alfred/mocking_adapters/mocha.rb

@@ -0,0 +1,55 @@
+# :nocov:
+
+# NOTE: No specs and coverage for Mocha since Mocha is automatically loaded in ActiveSupport::TestCase. It' ruins all rspec stubs for any_instance.
+# see: https://github.com/rails/rails/blob/701664b56b69827bfb46a5acfddf81d3a81b5d09/activesupport/lib/active_support/test_case.rb#L14
+
+# In order to support all versions of mocha, we have to jump through some
+# hoops here.
+#
+# mocha >= '0.13.0':
+#   require 'mocha/api' is required
+#   require 'mocha/object' raises a LoadError b/c the file no longer exists
+# mocha < '0.13.0', >= '0.9.7'
+#   require 'mocha/api' is required
+#   require 'mocha/object' is required
+# mocha < '0.9.7':
+#   require 'mocha/api' raises a LoadError b/c the file does not yet exist
+#   require 'mocha/standalone' is required
+#   require 'mocha/object' is required
+begin
+  require 'mocha/api'
+
+  begin
+    require 'mocha/object'
+  rescue LoadError
+    # Mocha >= 0.13.0 no longer contains this file nor needs it to be loaded
+  end
+rescue LoadError
+  require 'mocha/standalone'
+  require 'mocha/object'
+end
+
+module Alfred
+  module MockingAdapters
+    module Mocha
+
+      begin
+        include ::Mocha::API
+      rescue NameError
+        include ::Mocha::Standalone
+      end
+
+      def setup_mocks
+        mocha_setup
+      end
+
+      def teardown_mocks
+        mocha_verify
+      ensure
+        mocha_teardown
+      end
+
+    end # Mocha
+  end # MockingAdapters
+end # Alfred
+# :nocov:

data/lib/alfred/mocking_adapters/rr.rb

@@ -0,0 +1,21 @@
+require 'rr'
+
+module Alfred
+  module MockingAdapters
+    module RR
+
+      include ::RR::Extensions::InstanceMethods
+
+      def setup_mocks
+        ::RR::Space.instance.reset
+      end
+
+      def teardown_mocks
+        ::RR::Space.instance.verify_doubles
+      ensure
+        ::RR::Space.instance.reset
+      end
+
+    end # RR
+  end # MockingAdapters
+end # Alfred

data/lib/alfred/mocking_adapters/rspec.rb

@@ -0,0 +1,19 @@
+module Alfred
+  module MockingAdapters
+    module RSpec
+
+      # :nocov:
+      def setup_mocks
+        ::RSpec::Mocks.setup(self)
+      end
+
+      def teardown_mocks
+        ::RSpec::Mocks.verify
+      ensure
+        ::RSpec::Mocks.teardown
+      end
+      # :nocov:
+
+    end # RSpec
+  end # MockingAdapters
+end # Alfred

data/lib/{alfred_rails → alfred}/request.rb

@@ -9,12 +9,12 @@ module Alfred
     # === Example
     #
     #   request = Alfred::Request.new('test')
-    #   request.setup do
+    #   request.perform_setup do
     #     User.create(:name => 'John Doe')
     #   end
     #
-    def _setup(&block)
-      instance_eval(&block) if block_given?
+    def perform_setup(&block)
+      instance_exec(&block) if block_given?
     end
 
     ##

data/lib/{alfred_rails → alfred}/scenario.rb

@@ -3,7 +3,7 @@ module Alfred
 
     ## Attributes
 
-    attr_accessor :name, :setups, :method, :controller, :action, :params, :identifier
+    attr_accessor :name, :setups, :method, :controller, :action, :params, :identifier, :response
 
     ##
     # Initialize a new Alfred scenario.
@@ -40,11 +40,14 @@ module Alfred
     #
     def run
       setup_request
-      apply_setup
+      perform_setup
       perform_request
 
       ## Persist response to disk
       file.save
+    ensure
+      # Make sure to teardown mocks
+      @request.teardown_mocks
     end
 
     ##
@@ -62,26 +65,24 @@ module Alfred
       def setup_request
         controller.send(:include, ::Rails.application.routes.url_helpers)
 
-        ## Initialize mocking framework
-        Alfred::Mock.new
-
         ## Setup request
         @request = Request.new(name)
+        @request.setup_mocks
         @request.set_controller(controller)
         @request.setup_controller_request_and_response
       end
 
       ##
-      # Apply global and scenario setups to request.
+      # Perform global and scenario setups to request.
       #
-      def apply_setup
+      def perform_setup
         ## Run global setup before example
         Alfred.configuration.setup.each do |setup|
-          @request._setup(&setup)
+          @request.perform_setup(&setup)
         end
 
         ## Run setup blocks for scenario
-        setups.each { |setup| @request._setup(&setup) }
+        setups.each { |setup| @request.perform_setup(&setup) }
       end
 
       ##

data/lib/alfred/version.rb

@@ -0,0 +1,3 @@
+module Alfred
+  VERSION = "0.1.0.alpha"
+end

data/lib/{alfred_rails.rb → alfred.rb}

@@ -1,15 +1,14 @@
-require 'alfred_rails/version'
-require 'alfred_rails/rails'
-require 'alfred_rails/configuration'
-require 'alfred_rails/mock'
-require 'alfred_rails/registry'
-require 'alfred_rails/definition'
-require 'alfred_rails/scenario'
-require 'alfred_rails/fixture_file'
-require 'alfred_rails/scenario_dsl'
-require 'alfred_rails/request'
-require 'alfred_rails/runner'
-require 'alfred_rails/ui'
+require 'alfred/version'
+require 'alfred/rails'
+require 'alfred/configuration'
+require 'alfred/registry'
+require 'alfred/definition'
+require 'alfred/scenario'
+require 'alfred/fixture_file'
+require 'alfred/scenario_dsl'
+require 'alfred/request'
+require 'alfred/runner'
+require 'alfred/ui'
 
 require 'active_support'
 require 'database_cleaner'
@@ -64,7 +63,7 @@ module Alfred
     end
 
     ##
-    # Loads the configuration
+    # Loads the configuration.
     #
     def load_configuration!
       Dir["spec/alfred_helper.rb"].each { |f| load f }
@@ -72,19 +71,36 @@ module Alfred
     end
 
     ##
-    # Loads the configuration and scenario's
+    # Configure mock framework.
+    #
+    def configure_mock_framework!
+      require "alfred/mocking_adapters/#{configuration.mock_with}"
+      Request.send(:include, configuration.mock_adapter)
+    end
+
+    ##
+    # Includes configured modules in Request.
+    #
+    def include_modules!
+      ## Include modules from configuration
+      Alfred.configuration.includes.each do |mod|
+        Request.send(:include, mod)
+      end
+    end
+
+    ##
+    # Loads the configuration and scenario's.
     #
     def load!
       load_configuration!
+      configure_mock_framework!
+      include_modules!
 
       ## Load scenario's
+      # :nocov:
       Dir["spec/alfreds/**/*.rb"].each { |f| load f }
       Dir["test/alfreds/**/*.rb"].each { |f| load f }
-
-      ## Include modules from configuration
-      Alfred.configuration.includes.each do |mod|
-        Request.send(:include, mod)
-      end
+      # :nocov:
     end
 
     ##

data/lib/generators/alfred/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'alfred_rails'
+require 'alfred'
 
 module Alfred
   module Generators

data/lib/generators/alfred/install/install_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators'
-require 'alfred_rails'
+require 'alfred'
 
 module Alfred
   module Generators

data/lib/generators/alfred/install/templates/alfred_helper.erb

@@ -14,10 +14,10 @@ Alfred.configure do |config|
     ## Runs before every scenario
     DatabaseCleaner.clean
   end
-
+  <% if mock_with -%>
   ## Mocking framework
   config.mock_with :<%= mock_with %>
-
+  <% end -%>
   ## Fixture path
   config.fixture_path '<%= test_path %>/javascripts/fixtures'
 end

data/spec/{command_line_spec.rb → alfred/command_line_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'alfred_rails/command_line'
+require 'alfred/command_line'
 
 module Kernel
   def suppress_warnings
@@ -56,7 +56,7 @@ describe Alfred::CommandLine do
     it "has --version" do
       suppress_warnings { ARGV = ["--version"] }
       expect { subject.new.parse_options }.to raise_error SystemExit
-      expect(@log).to match(/\d+\.\d+\.\d+\n/)
+      expect(@log).to match(/\d+\.\d+\.\d+\.*./)
     end
 
   end

data/spec/{configuration_spec.rb → alfred/configuration_spec.rb}

@@ -24,14 +24,32 @@ describe Alfred::Configuration do
       configuration.fixture_path.should == "#{Rails.root}/test/javascripts/fixtures"
     end
 
-    it 'should set mocking framework to :rspec if Rspec::Mocks is defined' do
+    it 'should set mocking framework to :rspec if Rspec is defined' do
       configuration.mock_with.should == :rspec
     end
 
-    it 'should set mocking framework to :test_unit if Rspec::Mocks is not defined' do
+    it 'should set mocking framework to :mocha if Mocha is defined and Rspec is not' do
       Alfred::Configuration.any_instance.stub(:rspec_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:mocha_defined?).and_return(true)
       configuration = Alfred::Configuration.new
-      configuration.mock_with.should == :test_unit
+      configuration.mock_with.should == :mocha
+    end
+
+    it 'should set mocking framework to :ff if Mocha is defined and Mocha and Rspec are not' do
+      Alfred::Configuration.any_instance.stub(:rspec_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:mocha_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:rr_defined?).and_return(true)
+      configuration = Alfred::Configuration.new
+      configuration.mock_with.should == :rr
+    end
+
+    it 'should set mocking framework to :flexmock if Flexmock is defined and RR, Mocha and Rspec are not' do
+      Alfred::Configuration.any_instance.stub(:rspec_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:mocha_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:rr_defined?).and_return(false)
+      Alfred::Configuration.any_instance.stub(:flexmock_defined?).and_return(true)
+      configuration = Alfred::Configuration.new
+      configuration.mock_with.should == :flexmock
     end
 
   end
@@ -73,6 +91,23 @@ describe Alfred::Configuration do
 
   end
 
+  describe '#mock_adapter' do
+
+    it 'should return the correct mock adapter module' do
+      configuration.mock_with :rspec
+      configuration.mock_adapter.should == Alfred::MockingAdapters::RSpec
+
+      configuration.mock_with :rr
+      require 'alfred/mocking_adapters/rr'
+      configuration.mock_adapter.should == Alfred::MockingAdapters::RR
+
+      configuration.mock_with :flexmock
+      require 'alfred/mocking_adapters/flexmock'
+      configuration.mock_adapter.should == Alfred::MockingAdapters::Flexmock
+    end
+
+  end
+
   describe '#include' do
 
     it 'should add modules to include' do

data/spec/alfred/mocking_adapters/flexmock_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'mocking adapter for flexmock' do
+
+  before do
+    Alfred.configure do |config|
+      config.mock_with :flexmock
+    end
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should include the adapter in Request if Alfred is configured to mock with flexmock' do
+    Alfred::Request.should_receive(:include).with(Alfred::MockingAdapters::Flexmock)
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should be able to stub with Flexmock' do
+    Alfred.define do
+      scenario 'mock with Flexmock' do
+        setup { flexmock(User, :all => ['stubbed_with_flexmock']) }
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    scenario = Alfred.registry.all.first
+    scenario.run
+    scenario.response.body.should == "[\"stubbed_with_flexmock\"]"
+  end
+
+  it 'should teardown mocks for second scenario' do
+    Alfred.define do
+      scenario 'mock with Flexmock' do
+        setup { flexmock(User, :all => ['stubbed_with_flexmock']) }
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+      scenario 'teardown' do
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    Alfred.registry.all[0].run
+    scenario = Alfred.registry.all[1]
+    scenario.run
+    scenario.response.body.should == "[]"
+  end
+
+end

data/spec/alfred/mocking_adapters/rr_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'mocking adapter for rr' do
+
+  before do
+    Alfred.configure do |config|
+      config.mock_with :rr
+    end
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should include the adapter in Request if Alfred is configured to mock with rr' do
+    Alfred::Request.should_receive(:include).with(Alfred::MockingAdapters::RR)
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should be able to stub with rr' do
+    Alfred.define do
+      scenario 'mock with rr' do
+        setup do
+          stub(User).all { ['stubbed_with_rr'] }
+        end
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    scenario = Alfred.registry.all.first
+    scenario.run
+    scenario.response.body.should == "[\"stubbed_with_rr\"]"
+  end
+
+  it 'should teardown mocks for second scenario' do
+    Alfred.define do
+      scenario 'mock with rr' do
+        setup do
+          stub(User).all { ['stubbed_with_rr'] }
+        end
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+      scenario 'teardown' do
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    Alfred.registry.all[0].run
+    scenario = Alfred.registry.all[1]
+    scenario.run
+    scenario.response.body.should == "[]"
+  end
+
+end

data/spec/alfred/mocking_adapters/rspec_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'mocking adapter for rspec' do
+
+  before do
+    Alfred.configure do |config|
+      config.mock_with :rspec
+    end
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should include the adapter in Request if Alfred is configured to mock with rspec' do
+    Alfred::Request.should_receive(:include).with(Alfred::MockingAdapters::RSpec)
+    Alfred.configure_mock_framework!
+  end
+
+  it 'should be able to stub with RSpec' do
+    Alfred.define do
+      scenario 'mock with RSpec' do
+        setup { User.stub(:all).and_return(['stubbed_with_rspec']) }
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    scenario = Alfred.registry.all.first
+    scenario.run
+    scenario.response.body.should == "[\"stubbed_with_rspec\"]"
+  end
+
+  it 'should teardown mocks for second scenario' do
+    Alfred.define do
+      scenario 'mock with RSpec' do
+        setup { User.stub(:all).and_return(['stubbed_with_rspec']) }
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+      scenario 'teardown' do
+        setup { User.stub(:all).and_return(['other_stubbed_with_rspec']) }
+        controller Api::V1::UsersController
+        get :index, :format => :json
+      end
+    end
+    Alfred.registry.all[0].run
+    scenario = Alfred.registry.all[1]
+
+    scenario.run
+    scenario.response.body.should == "[\"other_stubbed_with_rspec\"]"
+  end
+
+end

data/spec/{request_spec.rb → alfred/request_spec.rb}

@@ -18,12 +18,12 @@ describe Alfred::Request do
 
   end
 
-  describe '#_setup' do
+  describe '#perform_setup' do
 
     it 'should execute the given block' do
-      request._setup { User.create(:name => 'John Doe') }
+      request.perform_setup { User.create(:name => 'John Doe') }
       User.count.should == 1
-      request._setup { User.create(:name => 'John Doe') }
+      request.perform_setup { User.create(:name => 'John Doe') }
       User.count.should == 2
     end
 

data/spec/{runner_spec.rb → alfred/runner_spec.rb}

@@ -170,7 +170,7 @@ describe Alfred::Runner do
 
       it 'should notify about running all files' do
         subject
-        @log.should include("Running all scenario's")
+        @log.should include("Serving all scenario's")
       end
     end
 

data/spec/alfred/scenario_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Alfred::Scenario do
+
+  let!(:scenario) { Alfred::Scenario.new('foo bar') }
+
+  it 'should downcase the name on initialize' do
+    scenario.name.should == 'foo_bar'
+  end
+
+  it 'should initialize with empty setups array' do
+    scenario.setups.should == []
+  end
+
+  describe '#controller_name' do
+
+    it 'should return underscored controller name' do
+      scenario.controller = Api::V1::UsersController
+      scenario.controller_name.should == 'api/v1/users_controller'
+    end
+
+  end
+
+  describe '#run' do
+
+    before(:each) do
+      Alfred.configure_mock_framework!
+      scenario.controller = Api::V1::UsersController
+      scenario.method = :get
+      scenario.action = :index
+      scenario.params = { :format => :json }
+    end
+
+    it 'should perform scenario setup' do
+      scenario.setups << Proc.new { User.create(:name => 'John Doe Setup') }
+      scenario.run
+      User.last.name.should == 'John Doe Setup'
+    end
+
+    it 'should perform configuration setup' do
+      Alfred.configure do |c|
+        c.setup do
+           User.create(:name => 'John Doe Setup from config')
+        end
+      end
+      scenario.run
+      User.last.name.should == 'John Doe Setup from config'
+    end
+
+  end
+
+end

data/spec/alfred_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Alfred do
+
+  describe '.configuration' do
+
+    it 'should return new or existing instance of configuration' do
+      Alfred.configuration.mock_with :rr
+      Alfred.configuration.mock_with.should == :rr
+    end
+
+  end
+
+  describe '.config' do
+
+    it 'should yield configuration instance' do
+      Alfred.configure do |c|
+        c.mock_with :rr
+      end
+      Alfred.configuration.mock_with.should == :rr
+    end
+
+  end
+
+  describe '.registry' do
+
+    it 'should return new or existing instance of registry' do
+      Alfred.registry.register('id', 'item')
+      Alfred.registry['id'].should == ['item']
+    end
+
+  end
+
+  describe '.include_modules!' do
+
+    it 'should include configured modules in Request' do
+      Alfred.configure { |c| c.include TestModule }
+
+      Alfred::Request.should_receive(:include).with(TestModule)
+      Alfred.include_modules!
+    end
+
+  end
+
+end

data/spec/generators/install/install_generator_spec.rb

@@ -13,8 +13,9 @@ describe Alfred::Generators::InstallGenerator do
 
   describe 'conditions' do
 
+    let!(:stub_class) { Alfred::Generators::InstallGenerator.any_instance }
+
     before(:each) do
-      stub_class = Alfred::Generators::InstallGenerator.any_instance
       stub_class.stub(:mock_with).and_return(:rspec)
       stub_class.stub(:devise_defined?).and_return(false)
       stub_class.stub(:factory_girl_defined?).and_return(false)
@@ -22,15 +23,15 @@ describe Alfred::Generators::InstallGenerator do
 
     subject { File.read(file('spec/alfred_helper.rb')) }
 
-    it "sets mocking framework to rspec if defined" do
+    it "sets mocking framework if defined" do
       run_generator
       subject.should include('config.mock_with :rspec')
     end
 
-    it "sets mocking framework to test_unit if rspec is not defined" do
-      Alfred::Generators::InstallGenerator.any_instance.stub(:mock_with).and_return(:test_unit)
+    it "doesn't set mocking framework if not defined" do
+      stub_class.stub(:mock_with).and_return(nil)
       run_generator
-      subject.should include('config.mock_with :test_unit')
+      subject.should_not include('config.mock_with')
     end
 
     it 'should include Devise::TestHelpers if Devise is defined' do

data/spec/spec_helper.rb

@@ -13,9 +13,9 @@ require 'rspec'
 require 'ammeter/init'
 require 'rspec/autorun'
 
-## Load alfred_rails
+## Load alfred
 
-require 'alfred_rails'
+require 'alfred'
 
 ## Make sure registry is empty after each example
 

data/spec/support/lib/test_module.rb

@@ -0,0 +1 @@
+module TestModule; end

data/spec/support/rails.rb

@@ -1,6 +1,6 @@
 ENV['RAILS_ENV'] = 'test'
 
-module AlfredRailsTest
+module AlfredTest
   class Application < Rails::Application
     config.eager_load                 = false
     config.active_support.deprecation = :log
@@ -11,4 +11,4 @@ module AlfredRailsTest
     end
   end
 end
-AlfredRailsTest::Application.initialize!
+AlfredTest::Application.initialize!

data/spec/support/routes.rb

@@ -1,4 +1,4 @@
-AlfredRailsTest::Application.routes.draw do
+AlfredTest::Application.routes.draw do
 
   namespace :api do
     namespace :v1 do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alfred_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.1.0.alpha
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -210,58 +238,65 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- alfred_rails.gemspec
+- alfred.gemspec
 - app/assets/javascripts/alfred.js.coffee
 - app/assets/javascripts/alfred/sinon_adapter.js.coffee
 - bin/alfred
-- lib/alfred_rails.rb
-- lib/alfred_rails/command_line.rb
-- lib/alfred_rails/configuration.rb
-- lib/alfred_rails/definition.rb
-- lib/alfred_rails/fixture_file.rb
-- lib/alfred_rails/mock.rb
-- lib/alfred_rails/rails.rb
-- lib/alfred_rails/registry.rb
-- lib/alfred_rails/request.rb
-- lib/alfred_rails/runner.rb
-- lib/alfred_rails/scenario.rb
-- lib/alfred_rails/scenario_dsl.rb
-- lib/alfred_rails/ui.rb
-- lib/alfred_rails/version.rb
+- lib/alfred.rb
+- lib/alfred/command_line.rb
+- lib/alfred/configuration.rb
+- lib/alfred/definition.rb
+- lib/alfred/fixture_file.rb
+- lib/alfred/mocking_adapters/flexmock.rb
+- lib/alfred/mocking_adapters/mocha.rb
+- lib/alfred/mocking_adapters/rr.rb
+- lib/alfred/mocking_adapters/rspec.rb
+- lib/alfred/rails.rb
+- lib/alfred/registry.rb
+- lib/alfred/request.rb
+- lib/alfred/runner.rb
+- lib/alfred/scenario.rb
+- lib/alfred/scenario_dsl.rb
+- lib/alfred/ui.rb
+- lib/alfred/version.rb
 - lib/generators/alfred/controller/controller_generator.rb
 - lib/generators/alfred/controller/templates/alfred.erb
 - lib/generators/alfred/install/install_generator.rb
 - lib/generators/alfred/install/templates/alfred_helper.erb
 - lib/tasks/alfred.rake
-- spec/command_line_spec.rb
-- spec/configuration_spec.rb
-- spec/definition_spec.rb
-- spec/fixture_file_spec.rb
+- spec/alfred/command_line_spec.rb
+- spec/alfred/configuration_spec.rb
+- spec/alfred/definition_spec.rb
+- spec/alfred/fixture_file_spec.rb
+- spec/alfred/mocking_adapters/flexmock_spec.rb
+- spec/alfred/mocking_adapters/rr_spec.rb
+- spec/alfred/mocking_adapters/rspec_spec.rb
+- spec/alfred/registry_spec.rb
+- spec/alfred/request_spec.rb
+- spec/alfred/runner_spec.rb
+- spec/alfred/scenario_dsl_spec.rb
+- spec/alfred/scenario_spec.rb
+- spec/alfred/ui_spec.rb
+- spec/alfred_spec.rb
 - spec/fixtures/database.yml
 - spec/generators/controller/controller_generator_spec.rb
 - spec/generators/install/install_generator_spec.rb
 - spec/javascripts/alfred/sinon_adapter_spec.js.coffee
 - spec/javascripts/alfred_spec.js.coffee
 - spec/javascripts/spec_helper.coffee
-- spec/mock_spec.rb
-- spec/registry_spec.rb
-- spec/request_spec.rb
-- spec/runner_spec.rb
-- spec/scenario_dsl_spec.rb
-- spec/scenario_spec.rb
 - spec/spec_helper.rb
 - spec/support/application.rb
 - spec/support/controllers/api/v1/posts_controller.rb
 - spec/support/controllers/api/v1/users_controller.rb
 - spec/support/lib/response_proxy.rb
+- spec/support/lib/test_module.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
 - spec/support/rails.rb
 - spec/support/routes.rb
 - spec/support/schema.rb
 - spec/teaspoon_env.rb
-- spec/ui_spec.rb
-homepage: https://github.com/jhnvz/alfred_rails.git
+homepage: https://github.com/jhnvz/alfred
 licenses:
 - MIT
 metadata: {}
@@ -286,31 +321,35 @@ signing_key:
 specification_version: 4
 summary: Serves controller responses under several conditions.
 test_files:
-- spec/command_line_spec.rb
-- spec/configuration_spec.rb
-- spec/definition_spec.rb
-- spec/fixture_file_spec.rb
+- spec/alfred/command_line_spec.rb
+- spec/alfred/configuration_spec.rb
+- spec/alfred/definition_spec.rb
+- spec/alfred/fixture_file_spec.rb
+- spec/alfred/mocking_adapters/flexmock_spec.rb
+- spec/alfred/mocking_adapters/rr_spec.rb
+- spec/alfred/mocking_adapters/rspec_spec.rb
+- spec/alfred/registry_spec.rb
+- spec/alfred/request_spec.rb
+- spec/alfred/runner_spec.rb
+- spec/alfred/scenario_dsl_spec.rb
+- spec/alfred/scenario_spec.rb
+- spec/alfred/ui_spec.rb
+- spec/alfred_spec.rb
 - spec/fixtures/database.yml
 - spec/generators/controller/controller_generator_spec.rb
 - spec/generators/install/install_generator_spec.rb
 - spec/javascripts/alfred/sinon_adapter_spec.js.coffee
 - spec/javascripts/alfred_spec.js.coffee
 - spec/javascripts/spec_helper.coffee
-- spec/mock_spec.rb
-- spec/registry_spec.rb
-- spec/request_spec.rb
-- spec/runner_spec.rb
-- spec/scenario_dsl_spec.rb
-- spec/scenario_spec.rb
 - spec/spec_helper.rb
 - spec/support/application.rb
 - spec/support/controllers/api/v1/posts_controller.rb
 - spec/support/controllers/api/v1/users_controller.rb
 - spec/support/lib/response_proxy.rb
+- spec/support/lib/test_module.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
 - spec/support/rails.rb
 - spec/support/routes.rb
 - spec/support/schema.rb
 - spec/teaspoon_env.rb
-- spec/ui_spec.rb

data/lib/alfred_rails/mock.rb

@@ -1,14 +0,0 @@
-module Alfred
-  class Mock
-
-    ##
-    # Initialize mocking framework based on configuration.
-    #
-    def initialize
-      if Alfred.configuration.mock_with == :rspec
-        RSpec::Mocks::setup(Object.new)
-      end
-    end
-
-  end # Mock
-end # Alfred

data/lib/alfred_rails/version.rb

@@ -1,3 +0,0 @@
-module Alfred
-  VERSION = "0.0.1.alpha"
-end

data/spec/mock_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Alfred::Mock do
-
-  describe '#new' do
-
-    it 'should initialize mocking framework based on mock_with in configuration' do
-      Alfred.configure do |config|
-        config.mock_with :rspec
-      end
-
-      RSpec::Mocks.should_receive(:setup)
-      Alfred::Mock.new
-    end
-
-  end
-
-end

data/spec/scenario_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe Alfred::Scenario do
-
-  let!(:scenario) { Alfred::Scenario.new('foo bar') }
-
-  it 'should downcase the name on initialize' do
-    scenario.name.should == 'foo_bar'
-  end
-
-  it 'should initialize with empty setups array' do
-    scenario.setups.should == []
-  end
-
-  describe '#controller_name' do
-
-    it 'should return underscored controller name' do
-      scenario.controller = Api::V1::UsersController
-      scenario.controller_name.should == 'api/v1/users_controller'
-    end
-
-  end
-
-end