kitestrings 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a1d7d5265a7012cea917f77889c82ee15d3735
-  data.tar.gz: 27aeeb8c04ef9a59318dee5f57962fbc812c99d9
+  metadata.gz: b5e7e7b1e26fec5ba18d84498ad21faf270e378f
+  data.tar.gz: 7e9c7e8e8c0879534bde9063c9842f4ddccd9e7e
 SHA512:
-  metadata.gz: 2de52f0b07968416e93b1a1e20ca4206018d96f02f25690317cc6cd892fb81f9971cd6aefd5b186ff300e9b021f817406ab3dc8f82c0c693d65ad43ab82c182d
-  data.tar.gz: 9136bbdc03df7fac3b93973dc555d24dcb340feee6b228b4218035fba4b14cccafaaf509969480f70ef830298b7a4bbf2d496502b6e76c44bf5638b0b147c21b
+  metadata.gz: 18fbd306f921ce2bbdb45acfae7a7e2e301d53ad1b3e23a638e53a96c697371b034c0e17ee22a9385ca95c0b6c8c45abb722c069b4e8ac04f17699205cfe6d1e
+  data.tar.gz: 9ca876d4e6842c11e225f8fb58c41903436d524de0cff886d44c7f847f6168451a2437592b62f5aa14cabeb597310b3cd2f388aba27ea6c4809b357a547777b2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version history:
 
+## 1.2.1
+* change to fixturen
+* scaffold generators cleaned up (rspec 3)
+
 ## 1.2.0
 * reformatting for rubocop
 

data/kitestrings.gemspec

@@ -6,9 +6,9 @@ require 'kitestrings/version'
 Gem::Specification.new do |spec|
   spec.name          = "kitestrings"
   spec.version       = Kitestrings::VERSION
-  spec.authors       = ["Tom Ridge", "Matt Connolly", "Geoffrey Donaldson"]
+  spec.authors       = ["Tom Ridge", "Matt Connolly", "Geoffrey Donaldson", "Nigel Rausch"]
   spec.email         = ["tom.ridge@tworedkites.com", "matt.connolly@tworedkites.com",
-                        "geoffrey.donaldson@tworedkites.com"]
+                        "geoffrey.donaldson@tworedkites.com", "nigel.rausch@tworedkites.com"]
   spec.summary       = %q{For all the 2rk goodness}
   spec.description   = %q{}
   spec.homepage      = ""

data/lib/generators/kitestrings/install_generator.rb

@@ -20,6 +20,7 @@ module Kitestrings
 
       def copy_rubocop_file
         copy_file "rubocop/.rubocop.yml", ".rubocop.yml"
+        directory "rubocop/routing", "spec/routing"
       end
 
       def copy_haml_files
@@ -50,8 +51,7 @@ module Kitestrings
 
       def setup_application_controller
         inject_into_file "app/controllers/application_controller.rb", :after => /protect_from_forgery.*$/ do
-          <<-EOF
-
+"
   respond_to :html
 
   unless Rails.application.config.consider_all_requests_local
@@ -60,8 +60,7 @@ module Kitestrings
       # Airbrake.notify(exception)
       render 'public/403', status: 403, layout: 'none'
     end
-  end
-EOF
+  end"
         end
       end
 
@@ -70,6 +69,7 @@ EOF
         generators_configuration = <<-END
 config.generators do |g|
       g.view_specs false
+      g.test_framework :rspec, fixture: true
     end
 
     config.app_generators do |g|

data/lib/generators/templates/rspec/model/fixtures.yml

@@ -0,0 +1,23 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+<% unless attributes.empty? -%>
+DEFAULTS: &DEFAULTS
+<% attributes[1..-1].each do |attribute| -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+
+<%= table_name.singularize %>:
+  <%= attributes.first.name %>: <%= table_name.singularize %>
+  <<: *DEFAULTS
+
+<%= table_name.singularize %>_other:
+  <%= attributes.first.name %>: <%= table_name.singularize %>_other
+  <<: *DEFAULTS
+<% else -%>
+# one:
+#   column: value
+#
+# two:
+#   column: value
+<% end -%>
+

data/lib/generators/templates/rspec/scaffold/controller_spec.rb

@@ -15,15 +15,13 @@ describe <%= controller_class_name %>Controller do
   before { allow(controller).to receive(:<%= file_name %>_params).and_return({}) }
 
   context 'not logged in' do
-    before do
-      sign_out :user
-    end
+    before { sign_out :user }
 
     { index: :get, show: :get, new: :get, create: :post, edit: :get, update: :put,
       destroy: :delete }.each do |v, m|
       it "#{m} #{v} should logout" do
         send(m, v, id: <%= file_name %>)
-        expect(response).to redirect_to new_user_session_path
+        is_expected.to redirect_to new_user_session_path
       end
     end
   end
@@ -38,85 +36,86 @@ describe <%= controller_class_name %>Controller do
         get :index
       end
 
-      it { expect(response).to assign_to(:<%= table_name %>).with_items([<%= file_name %>]) }
-      it { expect(response).to render_template :index }
-      it { expect(response).to have_only_fractures(:new_<%= file_name %>_link) }
+      it { is_expected.to assign_to(:<%= table_name %>).with_items(<%= file_name %>) }
+      it { is_expected.to render_template :index }
+      it { is_expected.to have_only_fractures(:new_<%= file_name %>_link) }
     end
 <% end -%>
 
     describe 'GET show' do
       before { get :show, id: <%= file_name %> }
 
-      it { expect(response).to assign_to(:<%= file_name %>).with(<%= file_name %>) }
-      it { expect(response).to render_template :show }
-      it { expect(response).to have_only_fractures(:edit_<%= file_name %>_link) }
+      it { is_expected.to assign_to(:<%= file_name %>).with(<%= file_name %>) }
+      it { is_expected.to render_template :show }
+      it { is_expected.to have_only_fractures(:edit_<%= file_name %>_link) }
     end
 
     describe 'GET new' do
       before { get :new }
 
-      it { expect(response).to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
-      # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
-      it { expect(response).to render_template :new }
-      it { expect(response).to have_only_fractures :cancel_new_<%= file_name %>_link }
-      it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
+      it { is_expected.to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
+      # it { is_expected.to assign_to('<%= file_name %>.parent').with(parent) }
+      it { is_expected.to render_template :new }
+      it { is_expected.to have_only_fractures :cancel_new_<%= file_name %>_link }
+      it { is_expected.to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
     end
 
     describe 'POST create' do
       context 'valid' do
         before do
-          <%= class_name %>.any_instance.stub(:valid?).and_return(true)
+          allow_any_instance_of(<%= class_name %>).to receive(:valid?).and_return(true)
           post :create
         end
 
-        it { expect(response).to redirect_to <%= file_name %>_path(<%= class_name %>.last) }
-        it { expect(response).to assign_to(:<%= file_name %>).with(<%= class_name %>.last) }
-        # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
+        it { is_expected.to redirect_to <%= file_name %>_path(<%= class_name %>.last) }
+        it { is_expected.to assign_to(:<%= file_name %>).with(<%= class_name %>.last) }
+        # it { is_expected.to assign_to('<%= file_name %>.parent').with(parent) }
       end
 
       context 'invalid' do
         before do
-          <%= class_name %>.any_instance.stub(:valid?).and_return(false)
+          allow_any_instance_of(<%= class_name %>).to receive(:valid?).and_return(false)
           post :create
         end
-        it { expect(response).to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
-        # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
-        it { expect(response).to render_template :new }
-        it { expect(response).to have_only_fractures :cancel_new_<%= file_name %>_link }
-        it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
+
+        it { is_expected.to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
+        # it { is_expected.to assign_to('<%= file_name %>.parent').with(parent) }
+        it { is_expected.to render_template :new }
+        it { is_expected.to have_only_fractures :cancel_new_<%= file_name %>_link }
+        it { is_expected.to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
       end
     end
 
     describe 'GET edit' do
       before { get :edit, id: <%= file_name %> }
 
-      it { expect(response).to assign_to(:<%= file_name %>).with(<%= file_name %>) }
-      it { expect(response).to render_template :edit }
-      it { expect(response).to have_only_fractures :cancel_edit_<%= file_name %>_link }
-      it { expect(response).to have_a_form.that_is_edit.with_path_of(<%= file_name %>_path) }
+      it { is_expected.to assign_to(:<%= file_name %>).with(<%= file_name %>) }
+      it { is_expected.to render_template :edit }
+      it { is_expected.to have_only_fractures :cancel_edit_<%= file_name %>_link }
+      it { is_expected.to have_a_form.that_is_edit.with_path_of(<%= file_name %>_path) }
     end
 
     describe 'PUT update' do
       context 'valid' do
         before do
-          <%= class_name %>.any_instance.stub(:valid?).and_return(true)
+          allow_any_instance_of(<%= class_name %>).to receive(:valid?).and_return(true)
           put :update, id: <%= file_name %>
         end
 
-        it { expect(response).to assign_to(:<%= file_name %>).with(<%= file_name %>) }
-        it { expect(response).to redirect_to <%= file_name %>_path(<%= file_name %>) }
+        it { is_expected.to assign_to(:<%= file_name %>).with(<%= file_name %>) }
+        it { is_expected.to redirect_to <%= file_name %>_path(<%= file_name %>) }
       end
       context 'invalid' do
         before do
           <%= file_name %>
-          <%= class_name %>.any_instance.stub(:valid?).and_return(false)
+          allow_any_instance_of(<%= class_name %>).to receive(:valid?).and_return(false)
           put :update, id: <%= file_name %>
         end
 
-        it { expect(response).to assign_to(:<%= file_name %>).with(<%= file_name %>) }
-        it { expect(response).to render_template :edit }
-        it { expect(response).to have_only_fractures :cancel_edit_<%= file_name %>_link }
-        it { expect(response).to have_a_form.that_is_edit.with_path_of(<%= file_name %>_path) }
+        it { is_expected.to assign_to(:<%= file_name %>).with(<%= file_name %>) }
+        it { is_expected.to render_template :edit }
+        it { is_expected.to have_only_fractures :cancel_edit_<%= file_name %>_link }
+        it { is_expected.to have_a_form.that_is_edit.with_path_of(<%= file_name %>_path) }
       end
     end
 
@@ -124,7 +123,7 @@ describe <%= controller_class_name %>Controller do
       before { delete :destroy, id: <%= file_name %> }
 
       it { expect(<%= class_name %>.find_by_id(<%= file_name %>.id)).to be_nil }
-      it { expect(response).to redirect_to <%= index_helper %>_path }
+      it { is_expected.to redirect_to <%= index_helper %>_path }
     end
   end
 end

data/lib/generators/templates/rubocop/routing/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from:
+  - ../../.rubocop.yml
+
+# Allow routing specs to be longer
+Metrics/LineLength:
+  Enabled: true
+  Max: 200

data/lib/generators/templates/spec/rails_helper.rb

@@ -35,7 +35,7 @@ RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
   config.global_fixtures = :selections
 
   # If true, the base class of anonymous controllers will be inferred

data/lib/generators/templates/support/assign_to_matcher.rb

@@ -0,0 +1,44 @@
+RSpec::Matchers.define :assign_to do |first|
+  match do |actual|
+    @actual = actual
+
+    firsts = first.to_s.split('.', 2)
+    if firsts.length == 2
+      @first = assigns(firsts.first).send(firsts.last)
+    else
+      @first = assigns(first)
+    end
+
+    case
+      when @second.is_a?(Class)
+        @first.is_a?(@second)
+      when @second.is_a?(Array)
+        expect(@first).to match_array(@second)
+      else
+        @first == @second
+    end
+  end
+
+  chain :with_items do |*second|
+    @second = Array(second)
+  end
+
+  chain :with do |second|
+    @second = second
+  end
+
+  chain :with_kind_of do |second|
+    @second = second
+  end
+
+  failure_message do
+    build = ''
+    if @second.is_a?(Array)
+      build = "Expected to get IDs of #{@first.map(&:id)} but got #{@second.map(&:id)}\n"\
+    end
+
+    build + "#{@first.inspect}\n"\
+      "  === BUT GOT ===\n"\
+      "#{@second.inspect}\n"
+  end
+end

data/lib/kitestrings/version.rb

@@ -1,3 +1,3 @@
 module Kitestrings
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: kitestrings
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Tom Ridge
 - Matt Connolly
 - Geoffrey Donaldson
+- Nigel Rausch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +102,7 @@ email:
 - tom.ridge@tworedkites.com
 - matt.connolly@tworedkites.com
 - geoffrey.donaldson@tworedkites.com
+- nigel.rausch@tworedkites.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -144,11 +146,14 @@ files:
 - lib/generators/templates/rails/scaffold_controller/controller.rb
 - lib/generators/templates/rspec/helper/helper_spec.rb
 - lib/generators/templates/rspec/integration/request_spec.rb
+- lib/generators/templates/rspec/model/fixtures.yml
 - lib/generators/templates/rspec/model/model_spec.rb
 - lib/generators/templates/rspec/scaffold/controller_spec.rb
 - lib/generators/templates/rspec/scaffold/routing_spec.rb
 - lib/generators/templates/rubocop/.rubocop.yml
+- lib/generators/templates/rubocop/routing/.rubocop.yml
 - lib/generators/templates/spec/rails_helper.rb
+- lib/generators/templates/support/assign_to_matcher.rb
 - lib/generators/templates/support/common_lets.rb
 - lib/generators/templates/support/database_cleaner.rb
 - lib/generators/templates/support/fracture.rb