enju_bookmark 0.1.2.pre14 → 0.1.2.pre15

data/spec/controllers/bookmark_stats_controller_spec.rb

@@ -11,7 +11,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
@@ -20,7 +20,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
@@ -29,7 +29,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
@@ -47,7 +47,7 @@ describe BookmarkStatsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -57,7 +57,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -67,7 +67,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -87,7 +87,7 @@ describe BookmarkStatsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         get :new
@@ -96,7 +96,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         get :new
@@ -105,7 +105,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
         get :new
@@ -125,7 +125,7 @@ describe BookmarkStatsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -135,7 +135,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -145,7 +145,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
@@ -170,7 +170,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
@@ -198,7 +198,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
@@ -226,7 +226,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
@@ -288,7 +288,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
@@ -310,7 +310,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
@@ -338,7 +338,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
@@ -387,7 +387,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested bookmark_stat" do
         delete :destroy, :id => @bookmark_stat.id
@@ -400,7 +400,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested bookmark_stat" do
         delete :destroy, :id => @bookmark_stat.id
@@ -413,7 +413,7 @@ describe BookmarkStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested bookmark_stat" do
         delete :destroy, :id => @bookmark_stat.id

data/spec/controllers/bookmarks_controller_spec.rb

@@ -318,10 +318,7 @@ describe BookmarksController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        @user = FactoryGirl.create(:admin)
-        sign_in @user
-      end
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested bookmark" do
@@ -348,10 +345,7 @@ describe BookmarksController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        @user = FactoryGirl.create(:librarian)
-        sign_in @user
-      end
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested bookmark" do
@@ -472,7 +466,7 @@ describe BookmarksController do
 
       it "redirects to the bookmarks list" do
         delete :destroy, :id => @bookmark.id
-        response.should redirect_to user_bookmarks_url(@bookmark.user)
+        response.should redirect_to bookmarks_url(user_id: @bookmark.user.username)
       end
     end
 
@@ -485,7 +479,7 @@ describe BookmarksController do
 
       it "redirects to the bookmarks list" do
         delete :destroy, :id => @bookmark.id
-        response.should redirect_to user_bookmarks_url(@bookmark.user)
+        response.should redirect_to bookmarks_url(user_id: @bookmark.user.username)
       end
     end
 
@@ -503,7 +497,7 @@ describe BookmarksController do
 
       it "should destroy my bookmark" do
         delete :destroy, :id => 3
-        response.should redirect_to user_bookmarks_url(users(:user1))
+        response.should redirect_to bookmarks_url(user_id: users(:user1).username)
       end
 
       it "should not destroy other user's bookmark" do

data/spec/controllers/tags_controller_spec.rb

@@ -9,7 +9,7 @@ describe TagsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all tags as @tags" do
         get :index
@@ -18,7 +18,7 @@ describe TagsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all tags as @tags" do
         get :index
@@ -27,7 +27,7 @@ describe TagsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all tags as @tags" do
         get :index
@@ -45,7 +45,7 @@ describe TagsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -55,7 +55,7 @@ describe TagsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -65,7 +65,7 @@ describe TagsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -85,7 +85,7 @@ describe TagsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -95,7 +95,7 @@ describe TagsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -105,7 +105,7 @@ describe TagsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested tag as @tag" do
         tag = FactoryGirl.create(:tag)
@@ -131,7 +131,7 @@ describe TagsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested tag" do
@@ -158,7 +158,7 @@ describe TagsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested tag" do
@@ -186,7 +186,7 @@ describe TagsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested tag" do
@@ -235,7 +235,7 @@ describe TagsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested tag" do
         delete :destroy, :id => @tag.name
@@ -248,7 +248,7 @@ describe TagsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested tag" do
         delete :destroy, :id => @tag.name
@@ -261,7 +261,7 @@ describe TagsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested tag" do
         delete :destroy, :id => @tag.name

data/spec/dummy/config/initializers/statesman.rb

@@ -0,0 +1,3 @@
+Statesman.configure do
+  storage_adapter(Statesman::Adapters::ActiveRecord)
+end

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

@@ -1,7 +1,6 @@
 class CreateAgents < ActiveRecord::Migration
   def change
     create_table :agents do |t|
-      t.integer :user_id
       t.string :last_name
       t.string :middle_name
       t.string :first_name
@@ -40,11 +39,9 @@ class CreateAgents < ActiveRecord::Migration
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
-      t.string :state
       t.text :email
       t.text :url
     end
-    add_index :agents, :user_id, :unique => true
     add_index :agents, :language_id
     add_index :agents, :country_id
     add_index :agents, :required_role_id

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -19,38 +19,26 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :height
       t.integer :width
       t.integer :depth
-      t.string :isbn
-      t.string :isbn10
-      t.string :wrong_isbn
-      t.string :nbn
-      t.string :lccn
-      t.string :oclc_number
-      t.string :issn
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
-      t.string :volume_number_list
-      t.string :issue_number_list
-      t.string :serial_number_list
+      t.string :volume_number_string
+      t.string :issue_number_string
+      t.string :serial_number_string
       t.integer :edition
       t.text :note
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false
     end
-    add_index :manifestations, :carrier_type_id
-    add_index :manifestations, :required_role_id
-    add_index :manifestations, :isbn
-    add_index :manifestations, :nbn
-    add_index :manifestations, :lccn
-    add_index :manifestations, :oclc_number
-    add_index :manifestations, :issn
+    #add_index :manifestations, :carrier_type_id
+    #add_index :manifestations, :required_role_id
     add_index :manifestations, :access_address
-    add_index :manifestations, :frequency_id
+    #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
+    add_index :manifestations, :date_of_publication
   end
 end

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,7 +1,6 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
@@ -13,10 +12,8 @@ class CreateItems < ActiveRecord::Migration
       t.integer :price
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
     end
-    #add_index :items, :manifestation_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id