kuppayam 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399490a09605673fa84564525b24b523247a942e
-  data.tar.gz: a7821fe0e6e97581a4e4a848837350b42562d54a
+  metadata.gz: 4998ab221ce7a37eeaa2da7f93e5100d626c407b
+  data.tar.gz: f7c4613e52dc060d0f0dea1f190728cb02971d8c
 SHA512:
-  metadata.gz: 16eb80c7bf139c2989db87a908baaeb39bd6dd9af73a2ff4bda239f12cb7f183c055dde1661d5bf45343a0e393e2bdd14552cc0838e6ba1dccf05f062e7bb5df
-  data.tar.gz: 061a9efcdc24885a90ba648170ca827c597631a09cd8b9f5691d1f1367a639fce53ad02bb63f3d4fdc370f0203c430e5ced1416b70b2ea964c825e0e8f68347e
+  metadata.gz: 3a629e6f1954c5812e734dd641aa324a3c011ec4af6ca58fedbcba8b1d4a227714574db288c47e92d17cc1301427616618994ddcb88128dc5e15567fdfeeb74d
+  data.tar.gz: e9d20ca257f99469c3da36da0e940ad0e18cf48f58cb5f5b5827c0c95098b6034dae12385805d6cd1c07734e2375b303869b2d0ce096f338b46d9b0f998c0b29

data/lib/generators/kuppayam/templates/spec/controllers/resource_controller_spec.rb

@@ -4,28 +4,28 @@ require 'spec_helper'
 
 describe <%= controller_class -%>, :type => :controller do
 
-  let(:user) {FactoryGirl.create(:user)}
-  let(:suspended_user) {FactoryGirl.create(:suspended_user)}
+  let(:user) {FactoryBot.create(:user)}
+  let(:suspended_user) {FactoryBot.create(:suspended_user)}
   
-  let(:site_role) {FactoryGirl.create(:role, name: "Site Admin")}
+  let(:site_role) {FactoryBot.create(:role, name: "Site Admin")}
   
-  let(:super_admin_user) {FactoryGirl.create(:super_admin_user)}
+  let(:super_admin_user) {FactoryBot.create(:super_admin_user)}
   let(:site_admin_user) { 
     site_role
-    user = FactoryGirl.create(:approved_user)
+    user = FactoryBot.create(:approved_user)
     user.add_role("Site Admin")
     user 
   }
-  let(:approved_user) {FactoryGirl.create(:approved_user)}
+  let(:approved_user) {FactoryBot.create(:approved_user)}
 
-  let(:published_<%= instance_name %>) {FactoryGirl.create(:published_<%= instance_name %>)}
-  let(:unpublished_<%= instance_name %>) {FactoryGirl.create(:unpublished_<%= instance_name %>)}
-  let(:suspended_<%= instance_name %>) {FactoryGirl.create(:suspended_<%= instance_name %>)}
-  let(:blocked_<%= instance_name %>) {FactoryGirl.create(:blocked_<%= instance_name %>)}
-  let(:removed_<%= instance_name %>) {FactoryGirl.create(:removed_<%= instance_name %>)}
+  let(:published_<%= instance_name %>) {FactoryBot.create(:published_<%= instance_name %>)}
+  let(:unpublished_<%= instance_name %>) {FactoryBot.create(:unpublished_<%= instance_name %>)}
+  let(:suspended_<%= instance_name %>) {FactoryBot.create(:suspended_<%= instance_name %>)}
+  let(:blocked_<%= instance_name %>) {FactoryBot.create(:blocked_<%= instance_name %>)}
+  let(:removed_<%= instance_name %>) {FactoryBot.create(:removed_<%= instance_name %>)}
   
   describe "index" do
-    2.times { FactoryGirl.create(:published_<%= instance_name %>) }
+    2.times { FactoryBot.create(:published_<%= instance_name %>) }
     context "Positive Case" do
       it "should be able to view the list of countries" do
         session[:id] = site_admin_user.id
@@ -55,7 +55,7 @@ describe <%= controller_class -%>, :type => :controller do
     context "Positive Case" do
       it "should be update status - publish" do
         session[:id] = site_admin_user.id
-        unpublished_<%= instance_name %> = FactoryGirl.create(:unpublished_<%= instance_name %>)
+        unpublished_<%= instance_name %> = FactoryBot.create(:unpublished_<%= instance_name %>)
         put :update_status, params: { use_route: 'dhatu', id: unpublished_<%= instance_name %>.id, status: :published }, xhr: true
         unpublished_<%= instance_name %>.reload
         expect(unpublished_<%= instance_name %>.published?).to be_truthy
@@ -64,7 +64,7 @@ describe <%= controller_class -%>, :type => :controller do
 
       it "should be update status - unpublish" do
         session[:id] = site_admin_user.id
-        published_<%= instance_name %> = FactoryGirl.create(:published_<%= instance_name %>)
+        published_<%= instance_name %> = FactoryBot.create(:published_<%= instance_name %>)
         put :update_status, params: { use_route: 'dhatu', id: published_<%= instance_name %>.id, status: :unpublished }, xhr: true
         published_<%= instance_name %>.reload
         expect(published_<%= instance_name %>.unpublished?).to be_truthy
@@ -73,7 +73,7 @@ describe <%= controller_class -%>, :type => :controller do
 
       it "should be update status - remove" do
         session[:id] = site_admin_user.id
-        unpublished_<%= instance_name %> = FactoryGirl.create(:unpublished_<%= instance_name %>)
+        unpublished_<%= instance_name %> = FactoryBot.create(:unpublished_<%= instance_name %>)
         put :update_status, params: { use_route: 'dhatu', id: unpublished_<%= instance_name %>.id, status: :removed }, xhr: true
         unpublished_<%= instance_name %>.reload
         expect(unpublished_<%= instance_name %>.removed?).to be_truthy
@@ -82,7 +82,7 @@ describe <%= controller_class -%>, :type => :controller do
 
       it "should be update status - archive" do
         session[:id] = site_admin_user.id
-        unpublished_<%= instance_name %> = FactoryGirl.create(:unpublished_<%= instance_name %>)
+        unpublished_<%= instance_name %> = FactoryBot.create(:unpublished_<%= instance_name %>)
         put :update_status, params: { use_route: 'dhatu', id: unpublished_<%= instance_name %>.id, status: :archived }, xhr: true
         unpublished_<%= instance_name %>.reload
         expect(unpublished_<%= instance_name %>.archived?).to be_truthy
@@ -115,7 +115,7 @@ describe <%= controller_class -%>, :type => :controller do
     context "Positive Case" do
       it "site admin should be able to create a region" do
         session[:id] = site_admin_user.id
-        <%= instance_name %>_params = FactoryGirl.build(:unpublished_<%= instance_name %>, name: "Some Name").attributes
+        <%= instance_name %>_params = FactoryBot.build(:unpublished_<%= instance_name %>, name: "Some Name").attributes
         expect do
           post :create, params: { use_route: 'dhatu', "<%= instance_name %>": <%= instance_name %>_params }, xhr: true
         end.to change(<%= model_class -%>, :count).by(1)
@@ -128,7 +128,7 @@ describe <%= controller_class -%>, :type => :controller do
     context "Positive Case" do
       it "site admin should be able to update a <%= instance_name %>" do
         session[:id] = site_admin_user.id
-        published_<%= instance_name %> = FactoryGirl.create(:published_<%= instance_name %>, title: "Some Title")
+        published_<%= instance_name %> = FactoryBot.create(:published_<%= instance_name %>, title: "Some Title")
         <%= instance_name %>_params = published_<%= instance_name %>.attributes.clone
         <%= instance_name %>_params["title"] = "Changed Title"
         expect do

data/lib/generators/kuppayam/templates/spec/factories/resource.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_<%= instance_name %>, class: <%= model_class %> do
     

data/lib/generators/kuppayam/templates/spec/models/resource_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 RSpec.describe <%= model_class %>, type: :model do
 
-  let(:<%= instance_name %>) {FactoryGirl.build(:<%= instance_name %>)}
+  let(:<%= instance_name %>) {FactoryBot.build(:<%= instance_name %>)}
   
   context "Factory" do
     it "should validate all the factories" do
-      expect(FactoryGirl.build(:published_<%= instance_name %>).valid?).to be true
-      expect(FactoryGirl.build(:unpublished_<%= instance_name %>).valid?).to be true
-      expect(FactoryGirl.build(:removed_<%= instance_name %>).valid?).to be true
-      expect(FactoryGirl.build(:archived_<%= instance_name %>).valid?).to be true
+      expect(FactoryBot.build(:published_<%= instance_name %>).valid?).to be true
+      expect(FactoryBot.build(:unpublished_<%= instance_name %>).valid?).to be true
+      expect(FactoryBot.build(:removed_<%= instance_name %>).valid?).to be true
+      expect(FactoryBot.build(:archived_<%= instance_name %>).valid?).to be true
     end
   end
 

data/lib/kuppayam/action_view/form_helper.rb

@@ -198,7 +198,7 @@ module Kuppayam
           object_name: object.class.name.underscore,
           required: true,
           label: foreign_key.to_s.titleize,
-          prompt: "Select",
+          prompt: "Please Select",
           editable: true,
           error_class: "has-error",
           form_style: "left-right"
@@ -222,12 +222,12 @@ module Kuppayam
         end
 
         selected_id = object.send(foreign_key)
-
+        
         theme_form_group(options[:label], required: options[:required], error_class: error_class, form_style: options[:form_style]) do
           if !options[:editable] && options[:assoc_object]
             raw(options[:assoc_object].send(options[:assoc_display_method]) + hidden_field_tag("#{options[:param_name]}[#{foreign_key}]", options[:assoc_object].id))
           else
-            collection_select(options[:object_name], foreign_key, options[:assoc_collection], :id, options[:assoc_display_method], {prompt: options[:prompt], selected: selected_id}, {:class => 'form-control'})
+            collection_select(options[:object_name], foreign_key, options[:assoc_collection], :id, options[:assoc_display_method], {include_blank: options[:include_blank], selected: selected_id}, {:class => 'form-control'})
           end + error_message
         end
       end

data/lib/kuppayam/engine.rb

@@ -30,7 +30,7 @@ module Kuppayam
 
     config.generators do |g|
       g.test_framework      :rspec, :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.fixture_replacement :factory_bot, :dir => 'spec/factories'
       g.assets false
       g.helper false
     end

data/lib/kuppayam/version.rb

@@ -1,3 +1,3 @@
 module Kuppayam
-  VERSION = '0.1.29'
+  VERSION = '0.1.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuppayam
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -277,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"