enju_inventory 0.1.11.pre9 → 0.1.11.pre10

data/spec/controllers/inventory_files_controller_spec.rb

@@ -6,183 +6,177 @@ describe InventoryFilesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all inventory_files as @inventory_files" do
         get :index
-        assigns(:inventory_files).should eq(InventoryFile.page(1))
+        expect(assigns(:inventory_files)).to eq(InventoryFile.page(1))
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all inventory_files as @inventory_files" do
         get :index
-        assigns(:inventory_files).should eq(InventoryFile.page(1))
+        expect(assigns(:inventory_files)).to eq(InventoryFile.page(1))
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns empty as @inventory_files" do
         get :index
-        assigns(:inventory_files).should be_empty
-        response.should be_forbidden
+        expect(assigns(:inventory_files)).to be_empty
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns empty as @inventory_files" do
         get :index
-        assigns(:inventory_files).should be_empty
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventory_files)).to be_empty
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory_file as @inventory_file" do
         get :show, :id => 1
-        assigns(:inventory_file).should eq(InventoryFile.find(1))
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested inventory_file as @inventory_file" do
         get :show, :id => 1
-        assigns(:inventory_file).should eq(InventoryFile.find(1))
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested inventory_file as @inventory_file" do
         get :show, :id => 1
-        assigns(:inventory_file).should eq(InventoryFile.find(1))
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested inventory_file as @inventory_file" do
         get :show, :id => 1
-        assigns(:inventory_file).should eq(InventoryFile.find(1))
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory_file as @inventory_file" do
         get :new
-        assigns(:inventory_file).should_not be_valid
-        response.should be_success
+        expect(assigns(:inventory_file)).to_not be_valid
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
-        assigns(:inventory_file).should_not be_valid
-        response.should be_success
+        expect(assigns(:inventory_file)).to_not be_valid
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
-        assigns(:inventory_file).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:inventory_file)).to_not be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
-        assigns(:inventory_file).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventory_file)).to_not be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "POST create" do
     describe "When logged in as Librarian" do
-      before(:each) do
-        @user = FactoryGirl.create(:librarian)
-        sign_in @user
-      end
+      login_fixture_librarian
 
       it "should create inventory_file" do
         post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
         assigns(:inventory_file).save!
-        assigns(:inventory_file).should be_valid
-        assigns(:inventory_file).user.username.should eq @user.username
-        response.should redirect_to inventory_file_url(assigns(:inventory_file))
+        expect(assigns(:inventory_file)).to be_valid
+        expect(assigns(:inventory_file).user.username).to eq @user.username
+        expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        @user = FactoryGirl.create(:user)
-        sign_in @user
-      end
+      login_fixture_user
 
       it "should be forbidden" do
         post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should be redirect to new session url" do
         post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
         get :edit, :id => inventory_file.id
-        assigns(:inventory_file).should eq(inventory_file)
+        expect(assigns(:inventory_file)).to eq(inventory_file)
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
         get :edit, :id => inventory_file.id
-        assigns(:inventory_file).should eq(inventory_file)
+        expect(assigns(:inventory_file)).to eq(inventory_file)
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
         get :edit, :id => inventory_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -190,43 +184,43 @@ describe InventoryFilesController do
       it "should not assign the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
         get :edit, :id => inventory_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "PUT update" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "should update inventory_file" do
         put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
-        response.should redirect_to inventory_file_url(assigns(:inventory_file))
+        expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should update inventory_file" do
         put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
-        response.should redirect_to inventory_file_url(assigns(:inventory_file))
+        expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not update inventory_file" do
         put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update inventory_file" do
         put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -237,7 +231,7 @@ describe InventoryFilesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested inventory_file" do
         delete :destroy, :id => @inventory_file.id
@@ -245,12 +239,12 @@ describe InventoryFilesController do
 
       it "redirects to the inventory_files list" do
         delete :destroy, :id => @inventory_file.id
-        response.should redirect_to(inventory_files_url)
+        expect(response).to redirect_to(inventory_files_url)
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested inventory_file" do
         delete :destroy, :id => @inventory_file.id
@@ -258,12 +252,12 @@ describe InventoryFilesController do
 
       it "redirects to the inventory_files list" do
         delete :destroy, :id => @inventory_file.id
-        response.should redirect_to(inventory_files_url)
+        expect(response).to redirect_to(inventory_files_url)
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested inventory_file" do
         delete :destroy, :id => @inventory_file.id
@@ -271,7 +265,7 @@ describe InventoryFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @inventory_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -282,7 +276,7 @@ describe InventoryFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @inventory_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/dummy/app/models/user.rb

@@ -1,28 +1,8 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :purchase_requests
-  has_many :order_lists
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
+  enju_leaf_user_model
 end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -0,0 +1,50 @@
+class CreateAgents < ActiveRecord::Migration
+  def change
+    create_table :agents do |t|
+      t.string :last_name
+      t.string :middle_name
+      t.string :first_name
+      t.string :last_name_transcription
+      t.string :middle_name_transcription
+      t.string :first_name_transcription
+      t.string :corporate_name
+      t.string :corporate_name_transcription
+      t.string :full_name
+      t.text :full_name_transcription
+      t.text :full_name_alternative
+      t.timestamps
+      t.datetime :deleted_at
+      t.string :zip_code_1
+      t.string :zip_code_2
+      t.text :address_1
+      t.text :address_2
+      t.text :address_1_note
+      t.text :address_2_note
+      t.string :telephone_number_1
+      t.string :telephone_number_2
+      t.string :fax_number_1
+      t.string :fax_number_2
+      t.text :other_designation
+      t.text :place
+      t.string :postal_code
+      t.text :street
+      t.text :locality
+      t.text :region
+      t.datetime :date_of_birth
+      t.datetime :date_of_death
+      t.integer :language_id, :default => 1, :null => false
+      t.integer :country_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
+      t.integer :lock_version, :default => 0, :null => false
+      t.text :note
+      t.integer :required_role_id, :default => 1, :null => false
+      t.integer :required_score, :default => 0, :null => false
+      t.text :email
+      t.text :url
+    end
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
+  end
+end

data/spec/dummy/db/migrate/002_devise_create_users.rb

@@ -0,0 +1,46 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    # add_index :users, :confirmation_token,   :unique => true
+    # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
+  end
+end