lazy-head-gen 0.5.1 → 0.6.0

data/README.md

@@ -1,8 +1,11 @@
 # lazy-head-gen
 
-lazy-head-gen provides some extra generators for the [Padrino](https://github.com/padrino/padrino-framework) framework.
+lazy-head-gen provides some extra generators for the
+[Padrino](https://github.com/padrino/padrino-framework) framework.
 
-The generators are hard wired to use ActiveRecord and MiniTest, as that is the options I normally use in development at [Head](http://www.headlondon.com).
+The generators are hard wired to use ActiveRecord and MiniTest,
+as these are the libraries we normally use in development at
+[Head](http://www.headlondon.com).
 
 ## Installation
 
@@ -17,7 +20,8 @@ gem 'lazy-head-gen', :group => [:development, :test]
 ```
 
 Padrino gotcha: You'll need to put the `gem 'lazy-head-gen'` requirement *after* `gem 'padrino'` in your Gemfile.
-lazy-head-gen depends on Padrino being loaded before it can do it's stuff.
+
+lazy-head-gen depends on Padrino being loaded before it can do its stuff.
 
 Also you will need to add this gem for both :development and :test groups in your Gemfile. There are a few bundled test helper functions and assertions which are used by the test files that are generated.
 
@@ -73,25 +77,59 @@ padrino g scaffold Product title:string summary:text quantity:integer available_
 
 ## Tests
 
-### Built in assertions and test helpers
-
 First off you will need to add this line to your test_config.rb file, after you have required boot.rb.
 
 ```
 include LazyHeadGen
 ```
 
-This will allow you to access the couple of test helpers that are used in the generated tests.
+This will allow you to access the `login_as` and `assert_admin_not_logged_in` methods used in the admin generated tests.
+
+__login_as__
 
-TODO: list test helper methods.
+```
+def login_as(account, password = "password", path = "/admin/sessions/create")
+  post path, {
+    :email => account.email, :password => password
+  }
+  follow_redirect!
+end
+
+alias :login_as_admin :login_as
+```
+
+This is also aliased as `login_as_admin` to avoid breaking any previously generated tests.
+
+__assert_admin_not_logged_in__
+
+```
+def assert_admin_not_logged_in
+  assert !last_response.ok?
+  assert_equal 302, last_response.status
+  assert_equal "http://example.org/admin/sessions/new", last_response.original_headers["Location"]
+end
+```
 
 ### blueprints.rb
 
-The scaffold and admin_controller_test generators are reliant on you using a blueprints.rb file.
+The scaffold and admin_controller_test generators are reliant on you using a
+machinist blueprints.rb file.
+
+## Changelog
+
+0.6.X - Removed admin_url helper as it wasn't really needed. If you are using this in your tests you should change them to Admin.url (standard Padrino way of accessing URL's).
+
+Also the syntax was incorrect for :create and :update URL's where the object had been put in the admin_url call. IE admin_url(:books, :create, :book => Book.make.attributes) should change to Admin.url(:books, :create), :book => Book.make.attributes
+
+Changed login_as_admin to login_as, although is aliased so shouldn't break any previous tests.
+
+0.5.X - Removed the shorthands for path, status etc because they
+weren't namespaced so they confliced with other tests and properties of objects...not good.
+
+If you have been using them in your projects you will need to change them to the regular variables, ie `last_response.status` etc.
 
 ## To Do List
 
-* Finish README - Built in assertions and test helpers
 * Add form output to the scaffold generator
 * Add documentation for testing gem dependencies
 
@@ -107,5 +145,6 @@ The scaffold and admin_controller_test generators are reliant on you using a blu
 
 ## Copyright
 
-Copyright (c) 2012 [Stuart Chinery](http://www.headlondon.com/who-we-are#stuart-chinery), [headlondon.com](http://www.headlondon.com)
+Copyright (c) 2012 [Stuart Chinery](http://www.headlondon.com/who-we-are#stuart-chinery) and [Dave Hrycyszyn](http://www.headlondon.com/who-we-are#david-hrycyszyn) - [headlondon.com](http://www.headlondon.com)
+
 See LICENSE.txt for further details.

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Some extra generators for Padrino, using ActiveRecord and MiniTest.}
   gem.description = %Q{lazy-head-gen adds some extra generators to Padrino. Currently they are hard wired to use ActiveRecord and MiniTest.}
   gem.email = "stuart.chinery@headlondon.com"
-  gem.authors = ["Stuart Chinery"]
+  gem.authors = ["Stuart Chinery", "Dave Hrycyszyn"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lazy-head-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lazy-head-gen"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Stuart Chinery"]
-  s.date = "2012-07-25"
+  s.authors = ["Stuart Chinery", "Dave Hrycyszyn"]
+  s.date = "2012-10-05"
   s.description = "lazy-head-gen adds some extra generators to Padrino. Currently they are hard wired to use ActiveRecord and MiniTest."
   s.email = "stuart.chinery@headlondon.com"
   s.extra_rdoc_files = [

data/lib/lazy-head-gen.rb

@@ -1,54 +1,29 @@
 begin
   require 'padrino-gen'
-  Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/lazy-head-gen/{bootstrapped_admin_app,admin_controller_test,scaffold}.rb']
+  Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/lazy-head-gen/{admin_controller_test,scaffold}.rb']
 rescue LoadError
   # Fail silently
 end
 
 module LazyHeadGen
-
   # Allows testing as a logged in admin user
   #
   # param [Account] account - The account to attempt login with
-  def login_as_admin(account)
-    post "/admin/sessions/create", {
-      :email => account.email, :password => "password"
+  def login_as(account, password = "password", path = "/admin/sessions/create")
+    post path, {
+      :email => account.email, :password => password
     }
     follow_redirect!
   end
 
+  alias :login_as_admin :login_as
+
   # Standard assertions to test when an admin user is not logged in
   # and trys to view an admin page
   #
   def assert_admin_not_logged_in
     assert !last_response.ok?
     assert_equal 302, last_response.status
-    assert_equal "http://example.org/admin/sessions/new", last_response.original_headers["Location"]
+    assert last_response.original_headers["Location"].include?(Admin.url(:sessions, :new))
   end
-
-  # Removing due to conflicts when testing.
-  #
-  # def path
-  #   last_request.path
-  # end
-
-  # def session
-  #   last_request.env['rack.session']
-  # end
-
-  # def body
-  #   last_response.body
-  # end
-
-  # def status
-  #   last_response.status
-  # end
-
-  # def location
-  #   last_response.original_headers["Location"]
-  # end
-
-  # def ok?
-  #   last_response.ok?
-  # end
 end

data/lib/lazy-head-gen/templates/admin_controller_test/admin_controller_test.rb.tt

@@ -2,17 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 describe "Admin::<%= @controller if @controller %>Controller" do
 
-  # START NOT LOGGED IN
-  describe "when not logged in" do
+  # START LOGGED IN
+  describe "when logged in" do
+    before do
+      @account = Account.make!
+      login_as(@account)
+    end
 
     # START GET index
     describe "GET index" do
       before do
-        get "/admin/<%= @pluralized %>"
+        get Admin.url(:<%= @pluralized %>, :index)
       end
 
-      it "should not display the <%= @pluralized %> index page" do
-        assert_admin_not_logged_in
+      it "should display the <%= @pluralized %> index page" do
+        assert_equal 200, last_response.status
+        assert_equal Admin.url(:<%= @pluralized %>, :index), last_request.path
       end
     end
     # END GET index
@@ -20,24 +25,30 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     # START GET new
     describe "GET new" do
       before do
-        get "/admin/<%= @pluralized %>/new"
+        get Admin.url(:<%= @pluralized %>, :new)
       end
 
-      it "should not display the <%= @pluralized %> new page" do
-        assert_admin_not_logged_in
+      it "should display the <%= @pluralized %> new page" do
+        assert_equal 200, last_response.status
+        assert_equal Admin.url(:<%= @pluralized %>, :new), last_request.path
       end
     end
     # END GET new
 
     # START POST create
-    describe "Post create" do
+    describe "POST create" do
       before do
-        post "/admin/<%= @pluralized %>/create",
-          :<%= @singular %> => <%= @model %>.make.attributes
+        @<%= @singular %>_count = <%= @model %>.count
+        post Admin.url(:<%= @pluralized %>, :create), :<%= @singular %> => <%= @model %>.make.attributes
+        follow_redirect!
       end
 
-      it "should not return the created text" do
-        assert_admin_not_logged_in
+      it "should redirect to the edit page" do
+        assert_equal Admin.url(:<%= @pluralized %>, :edit, :id => <%= @model %>.last.to_param), last_request.path
+      end
+
+      it "should create a <%= @singular %>" do
+        assert_equal @<%= @singular %>_count + 1, <%= @model %>.count
       end
     end
     # END POST create
@@ -46,12 +57,12 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     describe "GET edit" do
       before do
         @<%= @singular %> = <%= @model %>.make!
-
-        get "/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}"
+        get Admin.url(:<%= @pluralized %>, :edit, :id => @<%= @singular %>.to_param)
       end
 
-      it "should not display the <%= @pluralized %> edit page" do
-        assert_admin_not_logged_in
+      it "should display the <%= @pluralized %> edit page" do
+        assert_equal 200, last_response.status
+        assert_equal Admin.url(:<%= @pluralized %>, :edit, :id => @<%= @singular %>.to_param), last_request.path
       end
     end
     # END GET edit
@@ -60,51 +71,58 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     describe "PUT update" do
       before do
         @<%= @singular %> = <%= @model %>.make!
+        @<%= @singular %>_count = <%= @model %>.count
 
-        put "/admin/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}",
+        put Admin.url(:<%= @pluralized %>, :update, :id => @<%= @singular %>.to_param),
           :<%= @singular %> => <%= @model %>.make.attributes
+
+        @<%= @singular %>.reload
+        follow_redirect!
       end
 
-      it "should not return the updated text" do
-        assert_admin_not_logged_in
+      it "should redirect to the edit page" do
+        assert_equal Admin.url(:<%= @pluralized %>, :edit, :id => @<%= @singular %>.to_param), last_request.path
+      end
+
+      it "should not create a new a <%= @singular %>" do
+        assert_equal @<%= @singular %>_count, <%= @model %>.count
       end
     end
     # END PUT update
 
     # START DELETE destroy
-    describe "on DELETE destroy" do
+    describe "DELETE destroy" do
       before do
         @<%= @singular %> = <%= @model %>.make!
+        @<%= @singular %>_count = <%= @model %>.count
+        delete Admin.url(:<%= @pluralized %>, :destroy, :id => @<%= @singular %>.to_param)
+        follow_redirect!
+      end
 
-        delete "/admin/<%= @pluralized %>/destroy/#{@<%= @singular %>.to_param}"
+      it "should redirect to the index page" do
+        assert_equal Admin.url(:<%= @pluralized %>, :index), last_request.path
       end
 
-      it "should not return the destroyed text" do
-        assert_admin_not_logged_in
+      it "should destroy a <%= @singular %>" do
+        assert_equal @<%= @singular %>_count - 1, <%= @model %>.count
       end
     end
     # END DELETE destroy
 
   end
-  # END NOT LOGGED IN
+  # END LOGGED IN
 
-  # START LOGGED IN
-  describe "when logged in" do
-    before do
-      @account = Account.make!
-      login_as_admin(@account)
-    end
+  # START NOT LOGGED IN
+  describe "when not logged in" do
 
     # START GET index
     describe "GET index" do
       before do
-        get "/admin/<%= @pluralized %>"
+        get Admin.url(:<%= @pluralized %>, :index)
       end
 
-      it "should display the <%= @pluralized %> index page" do
-        assert ok?
-        assert_equal 200, last_response.status
-        assert_equal "/admin/<%= @pluralized %>", last_request.path
+      it "should not display the <%= @pluralized %> index page" do
+        assert_admin_not_logged_in
       end
     end
     # END GET index
@@ -112,32 +130,23 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     # START GET new
     describe "GET new" do
       before do
-        get "/admin/<%= @pluralized %>/new"
+        get Admin.url(:<%= @pluralized %>, :new)
       end
 
-      it "should display the <%= @pluralized %> new page" do
-        assert ok?
-        assert_equal 200, last_response.status
-        assert_equal "/admin/<%= @pluralized %>", last_request.path
+      it "should not display the <%= @pluralized %> new page" do
+        assert_admin_not_logged_in
       end
     end
     # END GET new
 
     # START POST create
-    describe "POST create" do
+    describe "Post create" do
       before do
-        @<%= @singular %>_count = <%= @model %>.count
-
-        post "/admin/<%= @pluralized %>/create", :<%= @singular %> => <%= @model %>.make.attributes
+        post Admin.url(:<%= @pluralized %>, :create), :<%= @singular %> => <%= @model %>.make.attributes
       end
 
-      it "should redirect to the edit page" do
-        assert_equal 302, last_response.status
-        assert location.include?("/admin/<%= @pluralized %>/edit/#{<%= @model %>.last.to_param}")
-      end
-
-      it "should create a <%= @singular %>" do
-        assert_equal @<%= @singular %>_count + 1, <%= @model %>.count
+      it "should not return the created text" do
+        assert_admin_not_logged_in
       end
     end
     # END POST create
@@ -145,14 +154,11 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     # START GET edit
     describe "GET edit" do
       before do
-        @<%= @singular %> = <%= @model %>.make!
-        get "/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}"
+        get Admin.url(:<%= @pluralized %>, :edit, :id => 1)
       end
 
-      it "should display the <%= @pluralized %> edit page" do
-        assert ok?
-        assert_equal 200, last_response.status
-        assert_equal "/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}", last_request.path
+      it "should not display the <%= @pluralized %> edit page" do
+        assert_admin_not_logged_in
       end
     end
     # END GET edit
@@ -160,45 +166,28 @@ describe "Admin::<%= @controller if @controller %>Controller" do
     # START PUT update
     describe "PUT update" do
       before do
-        @<%= @singular %> = <%= @model %>.make!
-        @<%= @singular %>_count = <%= @model %>.count
-
-        put "/admin/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}",
-          :<%= @singular %> => <%= @model %>.make.attributes
-
-        @<%= @singular %>.reload
+        put Admin.url(:<%= @pluralized %>, :update, :id => 1), :<%= @singular %> => <%= @model %>.make.attributes
       end
 
-      it "should redirect to the edit page" do
-        assert_equal 302, last_response.status
-        assert location.include?("/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}")
-      end
-
-      it "should not create a new a <%= @singular %>" do
-        assert_equal @<%= @singular %>_count, <%= @model %>.count
+      it "should not return the updated text" do
+        assert_admin_not_logged_in
       end
     end
     # END PUT update
 
     # START DELETE destroy
-    describe "DELETE destroy" do
+    describe "on DELETE destroy" do
       before do
-        @<%= @singular %> = <%= @model %>.make!
-        @<%= @singular %>_count = <%= @model %>.count
-        delete "/admin/<%= @pluralized %>/destroy/#{@<%= @singular %>.to_param}"
-      end
-
-      it "should redirect to the index page" do
-        assert_equal 302, last_response.status
+        delete Admin.url(:<%= @pluralized %>, :destroy, :id => 1)
       end
 
-      it "should destroy a <%= @singular %>" do
-        assert_equal @<%= @singular %>_count - 1, <%= @model %>.count
+      it "should not return the destroyed text" do
+        assert_admin_not_logged_in
       end
     end
     # END DELETE destroy
 
   end
-  # END LOGGED IN
+  # END NOT LOGGED IN
 
 end

data/lib/lazy-head-gen/templates/scaffold/controller_test.rb.tt

@@ -9,7 +9,7 @@ describe "<%= @controller if @controller %>Controller" do
     end
 
     it "should display the <%= @pluralized %> index page" do
-      assert_match "This is the index page", body
+      assert_match "This is the index page", last_response.body
     end
   end
   # END GET index
@@ -22,7 +22,7 @@ describe "<%= @controller if @controller %>Controller" do
     end
 
     it "should display the <%= @pluralized %> show page" do
-      assert_match "This is the show page", body
+      assert_match "This is the show page", last_response.body
     end
   end
   # END GET show
@@ -35,7 +35,7 @@ describe "<%= @controller if @controller %>Controller" do
     end
 
     it "should display the <%= @pluralized %> new page" do
-      assert_match "This is the new page", body
+      assert_match "This is the new page", last_response.body
     end
   end
   # END GET new
@@ -49,7 +49,7 @@ describe "<%= @controller if @controller %>Controller" do
 
     it "should redirect to the show page" do
       assert_equal 302, last_response.status
-      assert location.include?("/<%= @pluralized %>/show/")
+      assert last_response.original_headers["Location"].include?("/<%= @pluralized %>/show/")
     end
 
     it "should create a new <%= @singular %>" do
@@ -66,7 +66,7 @@ describe "<%= @controller if @controller %>Controller" do
     end
 
     it "should display the <%= @pluralized %> edit page" do
-      assert_match "This is the edit page", body
+      assert_match "This is the edit page", last_response.body
     end
   end
   # END GET edit
@@ -82,7 +82,7 @@ describe "<%= @controller if @controller %>Controller" do
 
     it "should redirect to the show page" do
       assert_equal 302, last_response.status
-      assert location.include?("/<%= @pluralized %>/show/")
+      assert last_response.original_headers["Location"].include?("/<%= @pluralized %>/show/")
     end
 
     it "should not create a new <%= @singular %>" do

data/test/helper.rb

@@ -15,7 +15,7 @@ require 'uuid'
 require 'thor/group'
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
-require File.dirname(__FILE__) + '/../lib/lazy-head-gen.rb'
+require 'lazy-head-gen'
 
 begin; require 'turn/autorun'; rescue LoadError; end
 
@@ -30,11 +30,6 @@ module Kernel
   end
 end
 
-#class Class
-# # Allow assertions in request context
-# include MiniTest::Assertions
-#end
-
 class MiniTest::Unit::TestCase
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
@@ -82,15 +77,4 @@ class MiniTest::Unit::TestCase
   def assert_no_match_in_file(pattern, file)
     File.exists?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
   end
-
-  # Delegate other missing methods to response.
-  # def method_missing(name, *args, &block)
-  #   if response && response.respond_to?(name)
-  #     response.send(name, *args, &block)
-  #   else
-  #     super(name, *args, &block)
-  #   end
-  # end
-
-  # alias :response :last_response
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: lazy-head-gen
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Stuart Chinery
+- Dave Hrycyszyn
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime