Saturday progress

spec/acceptance/suppliers/product_categories_spec.rb

@@ -2,11 +2,11 @@ require 'acceptance/acceptance_helper'
 
 feature 'Supplier product categories spec', %q{
   In order to manage product categories 
-  As a supplier
+  As a confirmed supplier
   I want to have control over product categories and associated products
 } do
   background do
-    create_supplier 'supplier@qwaiter.com'
+    create_confirmed_supplier 'supplier@qwaiter.com'
   end
   context "GET #index" do
     background do

spec/acceptance/suppliers/supplier_main_board_spec.rb_spec.rb

@@ -2,12 +2,12 @@ require 'acceptance/acceptance_helper'
 
 feature 'Supplier main board spec.rb', %q{
   In order to manage active lists and orders
-  As a supplier
+  As a confirmed supplier
   I want to have control over lists and orders from the main activity panel
 } do
   background do
     CouchPotato.couchrest_database.recreate!
-    create_supplier 'supplier@qwaiter.com'
+    create_confirmed_supplier 'supplier@qwaiter.com'
     create_user 'user@qwaiter.com'
   end
 

spec/acceptance/support/helpers.rb

@@ -8,6 +8,11 @@ module HelperMethods
     @supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, email: email, password: password)
   end
 
+  def create_confirmed_supplier(email, password='secret')
+    @supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, :confirmed, email: email, password: password)
+    @supplier.confirm! unless @supplier.confirmed?
+  end
+
   def login_user_as(email)
     visit "/users/sign_in"
     fill_in "user_email", with: email

spec/controllers/suppliers/lists_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Suppliers::ListsController do
   before :each do
-    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret')
+    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed)
     sign_in @supplier
   end
 

spec/controllers/suppliers/product_categories_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Suppliers::ProductCategoriesController do
   before :each do
-    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret')
+    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed)
     sign_in @supplier
   end
 

spec/controllers/suppliers/products_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Suppliers::ProductsController do
   before :each do
-    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret')
+    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed)
     sign_in @supplier
   end
 

spec/controllers/suppliers/sections_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Suppliers::SectionsController do
   before :each do
-    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret')
+    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed)
     sign_in @supplier
   end
 

spec/controllers/suppliers/tables_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Suppliers::TablesController do
   before :each do
-    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret')
+    @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed)
     sign_in @supplier
   end
 

spec/factories/supplier_factory.rb

@@ -1,6 +1,12 @@
 FactoryGirl.define do
   factory :supplier do
     sequence(:name){|i| "Supplier #{i}"}
+    email 'supplier@qwaiter.com'
     password 'secret'
+
+    trait :confirmed do
+      confirmed_at { Time.now }
+
+    end
   end
 end

spec/models/table_spec.rb

@@ -16,7 +16,6 @@ describe Table do
         @table2 = create :table, supplier: supplier, number: 4
         @table3 = create :table, supplier: supplier, number: 6
         @table4 = create :table, number: 4
-
       end
       it "returns all by default" do
         subject.should == [@table1, @table2, @table3]
@@ -26,6 +25,22 @@ describe Table do
         options[:per_page] = 2
         subject.size.should == 2
         subject.total_count.should == 3
+      end
+
+      it "should filter by table number using from_number" do
+        options[:per_page] = 1
+        options[:from_number] = 3
+        subject.size.should == 1
+        subject.total_pages.should == 2
+        subject.first.number.should == 4
+
+      end
+      it "should filter by table number using from_number and to_number" do
+        options[:from_number] = 3
+        options[:to_number] = 5
+        subject.size.should == 1
+        subject.total_pages.should == 1
+        subject.first.number.should == 4
 
       end
     end