controller_scaffolding 1.1.0 → 1.1.1

data/test/dummy/spec/requests/credit_card_infos_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "CreditCardInfos" do
 	before(:all) do
-    cmd_str = 'rails g controller_scaffolding credit_card_infos index new create --skip-search-sort' 
+    cmd_str = 'rails g controller_scaffolding credit_card_infos index new create ' 
     cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
 		puts "\n#{cmd_str}"
   	%x(#{cmd_str})
@@ -12,7 +12,7 @@ describe "CreditCardInfos" do
   end
 
   after(:all) do
-  	cmd_str = 'rails d controller_scaffolding credit_card_infos index new create --skip-search-sort' 
+  	cmd_str = 'rails d controller_scaffolding credit_card_infos index new create ' 
     cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
     puts "\n#{cmd_str}"
     %x(#{cmd_str})

data/test/dummy/spec/requests/fellows_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+#The main reson for this spec is to make sure the --skip-search-sort generator option works as
+# expected when running generator multiple times
+RSpec.describe "Fellows", :type => :request do
+  
+	describe "index" do
+	  before(:each) do
+  	  visit fellows_path
+  	end
+	  describe "with search/sort functionality" do
+	  	
+	  	before(:all) do
+		    cmd_str = 'rails g controller_scaffolding fellows index ' 
+		    cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
+				puts "\n#{cmd_str}"
+		  	%x(#{cmd_str})
+		    Rails.application.reload_routes!
+		  end
+		  after(:all) do
+		  	cmd_str = 'rails d controller_scaffolding fellows index ' 
+		    cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
+		    puts "\n#{cmd_str}"
+		    %x(#{cmd_str})
+		  end
+
+	    it "displays search form", :js => true do
+	    	page.should have_selector("input#search_for")
+        page.should have_selector("button#submit-search")
+        page.should have_selector("button#clear-search")  	
+	    end
+	    
+	    it "displays sort form" do
+	    	page.should have_select('sort_by')
+	    end
+
+	    it "has sort dropdown filled in with correct columns" do
+	    	sel_opts = ["First name","First name [desc]","Last name","Last name [desc]","Email", 
+                   "Email [desc]","Title", 
+                   "Title [desc]","Dob","Dob [desc]","Is manager","Is manager [desc]"]
+        page.should have_select('sort_by', :options => sel_opts)
+	    end
+	  end
+	  
+	  describe "without search/sort functionality", :js => true do
+	  	
+	  	before(:all) do
+		    cmd_str = 'rails g controller_scaffolding fellows index --skip-search-sort ' 
+		    cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
+				puts "\n#{cmd_str}"
+		  	%x(#{cmd_str})
+		    Rails.application.reload_routes!
+		  end
+		  after(:all) do
+		  	cmd_str = 'rails d controller_scaffolding fellows index  --skip-search-sort ' 
+		    cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper' 
+		    puts "\n#{cmd_str}"
+		    %x(#{cmd_str})
+		  end
+
+	    it "does not have a search form" do
+	    	page.should_not have_selector("input#search_for")
+        page.should_not have_selector("button#submit-search")
+        page.should_not have_selector("button#clear-search")
+	    end
+	    it "does not have a sort form" do
+	    	page.should_not have_select('sort_by')
+	    end
+	  end
+	end
+
+end

data/test/dummy/spec/requests/people_spec.rb

@@ -140,15 +140,16 @@ describe "People" do
       end
 
       #This one fails intermittently when all specs run together as "rspec spec"
-      it "displays a sort select list populated with all of the correct options", :js => false do
-        pending "test fails intermittently depending on the context it is run in"
+      it "displays a sort select list populated with all of the correct options", :js => true do
+        #pending "test fails intermittently depending on the context it is run in"
         visit people_path
         sel_opts = ["First name","First name [desc]","Last name","Last name [desc]","Email", 
                    "Email [desc]","Title", 
                    "Title [desc]","Dob","Dob [desc]","Is manager","Is manager [desc]"]
-        sleep 1
+        #binding.pry
         page.should have_select('sort_by', :options => sel_opts)
       end
+
       it "clears the search", :js => true do
         visit people_path
         fill_in("search_for", :with => "Search Text")
@@ -166,11 +167,9 @@ describe "People" do
 
         #This one fails intermittently when all specs run together as "rspec spec"
         it "sorts by last name descending when selected", :js => true do
-          pending "test fails intermittently depending on the context it is run in"
+          #pending "test fails intermittently depending on the context it is run in"
           visit people_path
-          sleep 1
           select("Last name [desc]", :from => "sort_by")
-          sleep 0.5
           last_names = all(:xpath, "//table/tbody/tr[@class='item']/td[2]")
           last_names.map(&:text).should == last_names.map(&:text).sort.reverse
         end

data/test/dummy/tmp/pids/server.pid

@@ -1 +1 @@
-11112
+19580