card 1.19.6 → 1.20.0

data/spec/lib/card/reference_spec.rb

@@ -64,7 +64,7 @@ describe Card::Reference do
     expect(Card["Ethan"].referers.map(&:name).include?("L")).not_to eq(nil)
   end
 
-  it "should update references on rename when requested" do
+  it "updates references on rename when requested" do
     create! "watermelon", "mmmm"
     create! "watermelon+seeds", "black"
     lew = create!("Lew", "likes [[watermelon]] and [[watermelon+seeds|seeds]]")
@@ -77,7 +77,7 @@ describe Card::Reference do
     expect(lew.reload.content).to eq(result)
   end
 
-  it "should update referers on rename when requested (case 2)" do
+  it "updates referers on rename when requested (case 2)" do
     card = Card["Administrator Menu+*self+*read"]
     old_refs = Card::Reference.where(referee_id: Card::AdministratorID)
 
@@ -89,14 +89,14 @@ describe Card::Reference do
     expect(old_refs).to eq(new_refs)
   end
 
-  it "should not update references when not requested" do
+  it "does not update references when not requested" do
     watermelon = create! "watermelon", "mmmm"
     watermelon_seeds = create! "watermelon+seeds", "black"
     lew = create!("Lew", "likes [[watermelon]] and [[watermelon+seeds|seeds]]")
 
     assert_equal [watermelon.id, watermelon_seeds.id],
                  lew.references_out.order(:id).map(&:referee_id),
-                 "should store referee ids"
+                 "stores referee ids"
 
     watermelon = Card["watermelon"]
     watermelon.update_referers = false
@@ -191,7 +191,7 @@ describe Card::Reference do
     expect(Card["search w refs"].content).to eq '{"name":"_+AAA"}'
   end
 
-  it "should handle commented nest" do
+  it "handles commented nest" do
     c = Card.create name: "nest comment test", content: "{{## hi mom }}"
     expect(c.errors.any?).to be_falsey
   end

data/spec/lib/card/set_spec.rb

@@ -19,12 +19,12 @@
 #       expect(@account_card.role).to eq('request')
 #     end
 #
-#     it "shouldn't have a reader method for card_writer" do
+#     it "does not have a reader method for card_writer" do
 #       expect(@account_card.respond_to?( :write)).to be_falsey
 #       expect(@account_card.method( :write= )).to be
 #     end
 #
-#     it "shouldn't have a reader method for card_reader" do
+#     it "does not have a reader method for card_reader" do
 #       expect(@account_card.method( :read)).to be
 #       expect(@account_card.respond_to?( :read= )).to be_falsey
 #     end
@@ -52,14 +52,14 @@
 #   #let(:html_format_double) { Card::Format::HtmlFormat }
 #   let(:html_format_double) { double("Card::Format::HtmlFormat") }
 #
-#   it "should define Formatter methods from modules" do
+#   it "defines Formatter methods from modules" do
 #     expect(format_double).to respond_to(:render_navbox_self_core)
 #     expect(format_double.method(:render_navbox_self_core)).to be
 #     expect(format_double.method(:_render_right_right_raw)).to be
 #     expect(format_double.method(:render_type_search_core)).to be
 #     expect(format_double.method(:_final_type_search_raw)).to be
 #   end
-#   it "should call set render methods" do
+#   it "calls set render methods" do
 #     expect(card_self).to receive(:_final_self_navbox_core)
 #     card_self.format.render_core
 #     #expect(card_right.format.method(:_render_right_right_raw)).to be
@@ -70,13 +70,13 @@
 #     expect(card.method(:_final_type_search_raw)).to be
 #     card.format.render_core
 #   end
-#   it "should define Formatter methods from modules" do
+#   it "defines Formatter methods from modules" do
 #     expect(html_format_double.method(:render_self_navbox_core)).to be
 #     expect(html_format_double.method(:_render_right_right_raw)).to be
 #     expect(html_format_double.method(:render_type_search_core)).to be
 #     expect(html_format_double.method(:_final_type_search_raw)).to be
 #   end
-#   it "should define Formatter methods from modules" do
+#   it "defines Formatter methods from modules" do
 #     expect(card_self).to receive(:_final_self_navbox_titled)
 #     card_self.render_titled
 #     expect(card_right.method(:_render_right_right_edit)).to be

data/spec/lib/card/subcards_spec.rb

@@ -12,6 +12,13 @@ describe Card::Subcards do
       expect(Card["card with subs+sub1"].content).to eq "this is sub1"
     end
 
+    it "check name-key bug" do
+      Card::Auth.as_bot do
+        Card.create! name: "Matthias", subcards: {"+name" => "test"}
+        expect(Card.exists? "Matthias+name").to be_truthy
+      end
+    end
+
     it "works with content string" do
       Card::Auth.as_bot do
         @card = Card.create!(
@@ -21,6 +28,13 @@ describe Card::Subcards do
       expect(Card["card with subs+sub1"].content).to eq "this is sub1"
     end
 
+    it "check unstable key bug" do
+      Card::Auth.as_bot do
+        Card.create! name: "Matthias", subcards: {"+name" => "test"}
+        expect(Card.exists? "Matthias+name").to be_truthy
+      end
+    end
+
     it "works with +name key in args" do
       Card::Auth.as_bot do
         @card = Card.create!(

data/spec/lib/card/view_cache_spec.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Cache::ViewCache do
-  it "gets cleared by Card::Cache.reset_all" do
-    Card::Cache::ViewCache.cache.write "testkey", 1
-    expect(Card::Cache::ViewCache.cache.exist? "testkey").to be_truthy
+describe Card::View do
+  it "cache gets cleared by Card::Cache.reset_all" do
+    Card::View.cache.write "testkey", 1
+    expect(Card::View.cache.exist? "testkey").to be_truthy
     Card::Cache.reset_all
-    expect(Card::Cache::ViewCache.cache.exist? "testkey").to be_falsey
+    expect(Card::View.cache.exist? "testkey").to be_falsey
   end
 end

data/spec/models/card/cardtype_spec.rb

@@ -7,7 +7,7 @@ class Card
 end
 
 describe "Card (Cardtype)" do
-  it "should not allow cardtype remove when instances present" do
+  it "does not allow cardtype remove when instances present" do
     Card.create name: "City", type: "Cardtype"
     city = Card.fetch("City")
     c1 = Card.create name: "Sparta", type: "City"
@@ -68,11 +68,11 @@ describe Card, "created without permission" do
   # FIXME:  this one should pass.  unfortunately when I tried to fix it it started looking like the clean solution
   #  was to rewrite most of the permissions section as simple validations and i decided not to go down that rabbit hole.
   #
-  # it "should not be valid" do
+  # it "does not be valid" do
   #  Card.new( name: 'foo', type: 'Cardtype').valid?.should_not be_true
   # end
 
-  it "should not create a new cardtype until saved" do
+  it "does not create a new cardtype until saved" do
     expect do
       Card.new(name: "foo", type: "Cardtype")
     end.not_to change(Card, :count)
@@ -84,18 +84,18 @@ describe Card, "Normal card with descendants" do
     @a = Card["A"]
   end
 
-  it "should confirm that it has descendants" do
+  it "confirms that it has descendants" do
     expect(@a.descendants.length).to be > 0
   end
 
-  it "should successfully have its type changed" do
+  it "has its type changed" do
     Card::Auth.as_bot do
       @a.type_id = Card::PhraseID
       @a.save!
       expect(Card["A"].type_code).to eq(:phrase)
     end
   end
-  it "should still have its descendants after changing type" do
+  it "still has its descendants after changing type" do
     Card::Auth.as_bot do
       assert type_id = Card.fetch_id("cardtype_e")
       @a.type_id = type_id
@@ -112,7 +112,7 @@ describe Card, "New Cardtype" do
     end
   end
 
-  it "should have create permissions" do
+  it "has create permissions" do
     expect(@ct.who_can(:create)).not_to be_nil
   end
 
@@ -129,7 +129,7 @@ describe Card, "Wannabe Cardtype Card" do
       @card.save!
     end
   end
-  it "should successfully change its type to a Cardtype" do
+  it "changes its type to a Cardtype" do
     expect(Card["convertible"].type_code).to eq(:cardtype)
   end
 end
@@ -145,16 +145,16 @@ describe Card, "Joe User" do
     @type_names = Card::Auth.createable_types
   end
 
-  it "should not have r3 permissions" do
+  it "does not have r3 permissions" do
     expect(@ucard.fetch(new: {}, trait: :roles).item_names.member?(@r3.name)).to be_falsey
   end
-  it "should ponder creating a card of Cardtype F, but find that he lacks create permissions" do
+  it "ponders creating a card of Cardtype F, but find that he lacks create permissions" do
     expect(Card.new(type: "Cardtype F").ok?(:create)).to be_falsey
   end
-  it "should not find Cardtype F on its list of createable cardtypes" do
+  it "does not find Cardtype F on its list of createable cardtypes" do
     expect(@type_names.member?("Cardtype F")).to be_falsey
   end
-  it "should find Basic on its list of createable cardtypes" do
+  it "finds Basic on its list of createable cardtypes" do
     expect(@type_names.member?("Basic")).to be_truthy
   end
 end
@@ -163,11 +163,11 @@ describe Card, "Cardtype with Existing Cards" do
   before do
     @ct = Card["Cardtype F"]
   end
-  it "should have existing cards of that type" do
+  it "has existing cards of that type" do
     expect(Card.search(type: @ct.name)).not_to be_empty
   end
 
-  it "should raise an error when you try to delete it" do
+  it "raises an error when you try to delete it" do
     Card::Auth.as_bot do
       @ct.delete
       expect(@ct.errors[:cardtype]).not_to be_empty
@@ -176,7 +176,7 @@ describe Card, "Cardtype with Existing Cards" do
 end
 
 describe Card::Set::Type::Cardtype do
-  it "should handle changing away from Cardtype" do
+  it "handles changing away from Cardtype" do
     Card::Auth.as_bot do
       ctg = Card.create! name: "CardtypeG", type: "Cardtype"
       ctg.type_id = Card::BasicID

data/spec/models/card/create_spec.rb

@@ -2,7 +2,7 @@
 
 # FIXME: this shouldn't be here
 describe Card::Set::Type::Cardtype, ".create with :codename" do
-  it "should work" do
+  it "works" do
     card = Card.create! name: "Foo Type", codename: "foo",
                         type: "Cardtype"
     expect(card.type_code).to eq(:cardtype)
@@ -16,7 +16,7 @@ describe Card, "created by Card.new" do
     end
   end
 
-  it "should not override explicit content with default content" do
+  it "does not override explicit content with default content" do
     Card::Auth.as_bot do
       Card.create! name: "blue+*right+*default", content: "joe", type: "Pointer"
       c = Card.new name: "Lady+blue", content: "[[Jimmy]]"

data/spec/models/card/trash_spec.rb

@@ -3,7 +3,7 @@
 require "card/action"
 
 describe Card, "deleting card" do
-  it "should require permission" do
+  it "requires permission" do
     a = Card["a"]
     Card::Auth.as :anonymous do
       expect(a.ok?(:delete)).to eq(false)
@@ -21,10 +21,10 @@ describe Card, "deleted card" do
       @c.delete!
     end
   end
-  it "should be in the trash" do
+  it "is in the trash" do
     expect(@c.trash).to be_truthy
   end
-  it "should come out of the trash when a plus card is created" do
+  it "comes out of the trash when a plus card is created" do
     Card::Auth.as_bot do
       Card.create(name: "A+*acct")
       c = Card["A"]
@@ -34,7 +34,7 @@ describe Card, "deleted card" do
 end
 
 describe Card, "in trash" do
-  it "should be retrieved by fetch with new" do
+  it "is retrieved by fetch with new" do
     Card.create(name: "Betty").delete
     c = Card.fetch "Betty", new: {}
     c.save
@@ -43,7 +43,7 @@ describe Card, "in trash" do
 end
 
 describe Card, "plus cards" do
-  it "should be deleted when root is" do
+  it "is deleted when root is" do
     Card::Auth.as "joe_admin" do
       c = Card.create! name: "zz+top"
       root = Card["zz"]
@@ -59,7 +59,7 @@ end
 describe Card do
   context "with revisions" do
     before { Card::Auth.as_bot { @c = Card["Wagn Bot"] } }
-    it "should not be removable" do
+    it "does not be removable" do
       expect(@c.delete).not_to be_truthy
     end
   end
@@ -70,7 +70,7 @@ describe Card do
         @c = Card.create! name: "User Must Die", type: "User"
       end
     end
-    it "should be removable" do
+    it "is removable" do
       expect(@c.delete!).to be_truthy
     end
   end
@@ -83,7 +83,7 @@ end
 #     # this ugly setup makes it so A+Admin is the actual user with edits..
 #     Card["Wagn Bot"].update_attributes! name: "A+Wagn Bot"
 #  end
-#  it "should not be removable" do
+#  it "does not be removable" do
 #    @a = Card['A']
 #    @a.delete.should_not be_true
 #  end
@@ -96,11 +96,11 @@ describe Card, "dependent removal" do
     @c = Card.find_by_key "A+B+C".to_name.key
   end
 
-  it "should be trash" do
+  it "is trash" do
     expect(@c.trash).to be_truthy
   end
 
-  it "should not be findable by name" do
+  it "does not be findable by name" do
     expect(Card["A+B+C"]).to eq(nil)
   end
 end
@@ -117,11 +117,11 @@ describe Card, "rename to trashed name" do
     end
   end
 
-  it "should rename b to a" do
+  it "renames b to a" do
     expect(@b.name).to eq("A")
   end
 
-  it "should rename a to a*trash" do
+  it "renames a to a*trash" do
     expect((c = Card.find(@a.id)).cardname.to_s).to eq("A*trash")
     expect(c.name).to eq("A*trash")
     expect(c.key).to eq("a*trash")
@@ -136,15 +136,15 @@ describe Card, "sent to trash" do
     end
   end
 
-  it "should be trash" do
+  it "is trash" do
     expect(@c.trash).to eq(true)
   end
 
-  it "should not be findable by name" do
+  it "does not be findable by name" do
     expect(Card["basicname"]).to eq(nil)
   end
 
-  it "should still have actions" do
+  it "still has actions" do
     expect(@c.actions.count).to eq(2)
     expect(@c.last_change_on(:db_content).value).to eq("basiccontent")
   end
@@ -159,19 +159,19 @@ describe Card, "revived from trash" do
     end
   end
 
-  it "should not be trash" do
+  it "does not be trash" do
     expect(@c.trash).to eq(false)
   end
 
-  it "should have 3 actions" do
+  it "has 3 actions" do
     expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old content" do
+  it "still has old content" do
     expect(@c.nth_action(1).value :db_content).to eq("basiccontent")
   end
 
-  it "should have the same content" do
+  it "has the same content" do
     expect(@c.content).to eq("revived content")
     #    Card.fetch(@c.name).content.should == 'revived content'
   end
@@ -184,7 +184,7 @@ describe Card, "recreate trashed card via new" do
   #  end
 
   #  this test is known to be broken; we've worked around it for now
-  #  it "should delete and recreate with a different cardtype" do
+  #  it "deletes and recreate with a different cardtype" do
   #    @c.delete!
   #    @re_c = Card.new type: "Phrase", name: "BasicMe", content: "Banana"
   #    @re_c.save!
@@ -200,19 +200,19 @@ describe Card, "junction revival" do
     end
   end
 
-  it "should not be trash" do
+  it "does not be trash" do
     expect(@c.trash).to eq(false)
   end
 
-  it "should have 3 actions" do
+  it "has 3 actions" do
     expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old action" do
+  it "still has old action" do
     expect(@c.nth_action(1).value :db_content).to eq("basiccontent")
   end
 
-  it "should have old content" do
+  it "has old content" do
     expect(@c.db_content).to eq("revived content")
   end
 end

data/spec/models/card/type_transition_spec.rb

@@ -61,7 +61,7 @@ describe Card, "with role" do
     end
   end
 
-  it "should have a role type" do
+  it "has a role type" do
     expect(@role.type_id).to eq(Card::RoleID)
   end
 end
@@ -73,27 +73,27 @@ describe Card, "with account" do
     end
   end
 
-  it "should not have errors" do
+  it "does not have errors" do
     expect(@joe.errors.empty?).to eq(true)
   end
 
-  it "should allow type changes" do
+  it "allows type changes" do
     expect(@joe.type_code).to eq(:basic)
   end
 end
 
 describe Card, "type transition approve create" do
-  it "should have cardtype b create role r1" do
+  it "has cardtype b create role r1" do
     expect((c = Card.fetch("Cardtype B+*type+*create")).content).to eq("[[r1]]")
     expect(c.type_code).to eq(:pointer)
   end
 
-  it "should have errors" do
+  it "has errors" do
     c = change_card_to_type "basicname", "cardtype_b"
     expect(c.errors[:permission_denied]).not_to be_empty
   end
 
-  it "should be the original type" do
+  it "is the original type" do
     -> { change_card_to_type "basicname", "cardtype_b" }
     expect(Card["basicname"].type_code).to eq(:basic)
   end
@@ -104,7 +104,7 @@ describe Card, "type transition delete callback" do
     @c = change_card_to_type("type-e-card", :basic)
   end
 
-  it "should change type of the card" do
+  it "changes type of the card" do
     expect(Card["type-e-card"].type_code).to eq(:basic)
   end
 end
@@ -118,7 +118,7 @@ describe Card, "type transition create callback" do
     @c = change_card_to_type("basicname", :cardtype_f)
   end
 
-  it "should change type of card" do
+  it "changes type of card" do
     expect(Card["basicname"].type_code).to eq(:cardtype_f)
   end
 end