wagn 1.13.0 → 1.14.0.pre1

data/spec/mailers/mailer_spec.rb

@@ -4,8 +4,6 @@ describe Card::Mailer do
   #include ActionMailer::Quoting
 
   before do
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
     @expected = Mail.new
@@ -15,34 +13,47 @@ describe Card::Mailer do
   ## see notifier test for data used in these tests
   # FIXME: the cache is not cleared properly between tests.  if the order changes
   #  (ie try renamed change notice below to change_notice) then *notify+*from gets stuck on.
-  context "change notice" do
-    before do
-      user =  Card['sara'].id
-      card =  Card["Sunglasses"]
-      action = "edited"
-      Card::Mailer.change_notice( user, card, action, card.name ).deliver
-    end
-
-    it "deliver a message" do
-      assert_equal 1, ActionMailer::Base.deliveries.size
-    end
-
-    context "change notice message" do
-      before do
-        @mail = ActionMailer::Base.deliveries[0]
-      end
-      it "is addressed to users email" do
-        assert_equal ["sara@user.com"],  @mail.to
-      end
-      it "is from Wag bot email" do
-        assert_equal [Card[Card::WagnBotID].account.email], @mail.from
-      end
-    end
-  end
-
-  describe "flexmail" do
-    # FIXME: at least two tests should be here, with & w/o attachment.
-  end
+  # context "change notice" do
+  #   before do
+  #     user =  Card['sara'].id
+  #     card =  Card["Sunglasses"]
+  #     action = "edited"
+  #     Card::Mailer.change_notice( user, card, action, card.name ).deliver
+  #   end
+  #
+  #   it "deliver a message" do
+  #     assert_equal 1, ActionMailer::Base.deliveries.size
+  #   end
+  #
+  #   context "change notice message" do
+  #     before do
+  #       @mail = ActionMailer::Base.deliveries[0]
+  #     end
+  #     it "is addressed to users email" do
+  #       assert_equal ["sara@user.com"],  @mail.to
+  #     end
+  #     it "is from Wag bot email" do
+  #       assert_equal [Card[Card::WagnBotID].account.email], @mail.from
+  #     end
+  #   end
+  # end
+  #
+  # describe "flexmail" do
+  #   # FIXME: at least two tests should be here, with & w/o attachment.
+  # end
+  
+  
+  
+  # describe "cardmail" do
+  #   before do
+  #     Card.gimme "mailtest", :content => "test"
+  #   end
+  #   it "renders email text" do
+  #     Card::Mailer.cardmail(:to => "sara@user.com").deliver
+  #     @mail = ActionMailer::Base.deliveries.last
+  #     expect(@mail.body).to eq("test")
+  #   end
+  # end
 
   private
     def encode(subject)

data/spec/models/card/cardtype_spec.rb

@@ -18,7 +18,7 @@ describe "Card (Cardtype)" do
       city.delete!
     end
     # make sure it wasn't deleted / trashed
-    Card['City'].should_not be_nil
+    expect(Card['City']).not_to be_nil
   end
 
   it "remove cardtype" do
@@ -41,16 +41,16 @@ describe "Card (Cardtype)" do
   describe "conversion to cardtype" do
     before do
       @card = Card.create!(:type=>'Cardtype', :name=>'Cookie')
-      @card.type_name.should == 'Cardtype'
+      expect(@card.type_name).to eq('Cardtype')
     end
 
     it "creates cardtype model and permission" do
       @card.type_id = Card.fetch_id('cookie')
       @card.save!
-      @card.type_name.should == 'Cookie'
+      expect(@card.type_name).to eq('Cookie')
       @card=Card['Cookie']
       assert_instance_of Card, @card
-      @card.type_code.should == nil # :cookie
+      expect(@card.type_code).to eq(nil) # :cookie
       assert_equal 'Cookie', Card.create!( :name=>'Oreo', :type=>'Cookie' ).type_name
     end
   end
@@ -77,9 +77,9 @@ describe Card, "created without permission" do
   #end
 
   it "should not create a new cardtype until saved" do
-    lambda {
+    expect {
       Card.new( :name=>'foo', :type=>'Cardtype')
-    }.should_not change(Card, :count)
+    }.not_to change(Card, :count)
   end
 end
 
@@ -89,20 +89,20 @@ describe Card, "Normal card with dependents" do
     @a = Card['A']
   end
   it "should confirm that it has dependents" do
-    @a.dependents.length.should > 0
+    expect(@a.dependents.length).to be > 0
   end
   it "should successfully have its type changed" do
     Card::Auth.as_bot do
       @a.type_id = Card::PhraseID;
       @a.save!
-      Card['A'].type_code.should== :phrase
+      expect(Card['A'].type_code).to eq(:phrase)
     end
   end
   it "should still have its dependents after changing type" do
     Card::Auth.as_bot do
       assert type_id = Card.fetch_id('cardtype_e')
       @a.type_id = type_id; @a.save!
-      Card['A'].dependents.length.should > 0
+      expect(Card['A'].dependents.length).to be > 0
     end
   end
 end
@@ -133,11 +133,11 @@ describe Card, "New Cardtype" do
   end
 
   it "should have create permissions" do
-    @ct.who_can(:create).should_not be_nil
+    expect(@ct.who_can(:create)).not_to be_nil
   end
 
   it "its create permissions should be based on Basic" do
-    @ct.who_can(:create).should == Card['Basic'].who_can(:create)
+    expect(@ct.who_can(:create)).to eq(Card['Basic'].who_can(:create))
   end
 end
 
@@ -151,7 +151,7 @@ describe Card, "Wannabe Cardtype Card" do
 
   end
   it "should successfully change its type to a Cardtype" do
-    Card['convertible'].type_code.should==:cardtype
+    expect(Card['convertible'].type_code).to eq(:cardtype)
   end
 end
 
@@ -167,16 +167,16 @@ describe Card, "Joe User" do
   end
 
   it "should not have r3 permissions" do
-    @ucard.fetch(:new=>{}, :trait=>:roles).item_names.member?(@r3.name).should be_false
+    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
-    Card.new(:type=>'Cardtype F').ok?(:create).should be_false
+    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
-    @type_names.member?('Cardtype F').should be_false
+    expect(@type_names.member?('Cardtype F')).to be_falsey
   end
   it "should find Basic on its list of createable cardtypes" do
-    @type_names.member?('Basic').should be_true
+    expect(@type_names.member?('Basic')).to be_truthy
   end
 
 end
@@ -187,13 +187,13 @@ describe Card, "Cardtype with Existing Cards" do
     @ct = Card['Cardtype F']
   end
   it "should have existing cards of that type" do
-    Card.search(:type=>@ct.name).should_not be_empty
+    expect(Card.search(:type=>@ct.name)).not_to be_empty
   end
 
   it "should raise an error when you try to delete it" do
     Card::Auth.as_bot do
       @ct.delete
-      @ct.errors[:cardtype].should_not be_empty
+      expect(@ct.errors[:cardtype]).not_to be_empty
     end
   end
 end
@@ -207,7 +207,7 @@ describe Card::Set::Type::Cardtype do
       ctg.type_id = Card::BasicID
       ctg.save!
       ctg = Card["CardtypeG"]
-      ctg.type_code.should == :basic
+      expect(ctg.type_code).to eq(:basic)
       #ctg.extension.should == nil
     end
   end

data/spec/models/card/create_spec.rb

@@ -3,7 +3,7 @@
 # FIXME this shouldn't be here
 describe Card::Set::Type::Cardtype, ".create with :codename" do
   it "should work" do
-    Card.create!(:name=>"Foo Type", :codename=>"foo", :type=>'Cardtype').type_code.should==:cardtype
+    expect(Card.create!(:name=>"Foo Type", :codename=>"foo", :type=>'Cardtype').type_code).to eq(:cardtype)
   end
 end
 
@@ -21,7 +21,7 @@ describe Card, "created by Card.new " do
     Card::Auth.as_bot do
       Card.create! :name => "blue+*right+*default", :content => "joe", :type=>"Pointer"
       c = Card.new :name => "Lady+blue", :content => "[[Jimmy]]"
-      c.content.should == "[[Jimmy]]"
+      expect(c.content).to eq("[[Jimmy]]")
     end
   end
 end
@@ -36,18 +36,18 @@ describe Card, "created by Card.create with valid attributes" do
     end
   end
 
-  it "should not have errors"        do @b.errors.size.should == 0        end
-  it "should have the right class"   do @c.class.should    == Card end
-  it "should have the right key"     do @c.key.should      == "new_card"  end
-  it "should have the right name"    do @c.name.should     == "New Card"  end
-  it "should have the right content" do @c.content.should  == "Great Content" end
+  it "should not have errors"        do expect(@b.errors.size).to eq(0)        end
+  it "should have the right class"   do expect(@c.class).to    eq(Card) end
+  it "should have the right key"     do expect(@c.key).to      eq("new_card")  end
+  it "should have the right name"    do expect(@c.name).to     eq("New Card")  end
+  it "should have the right content" do expect(@c.content).to  eq("Great Content") end
 
-  it "should have a revision with the right content" do
-    @c.current_revision.content == "Great Content"
+  it "should have the right content" do
+    @c.db_content == "Great Content"
   end
 
   it "should be findable by name" do
-    Card["New Card"].class.should == Card
+    expect(Card["New Card"].class).to eq(Card)
   end
 end
 
@@ -58,19 +58,19 @@ describe Card, "create junction" do
   end
 
   it "should not have errors" do
-    @c.errors.size.should == 0
+    expect(@c.errors.size).to eq(0)
   end
 
   it "should create junction card" do
-    Card["Peach+Pear"].class.should == Card
+    expect(Card["Peach+Pear"].class).to eq(Card)
   end
 
   it "should create trunk card" do
-    Card["Peach"].class.should == Card
+    expect(Card["Peach"].class).to eq(Card)
   end
 
   it "should create tag card" do
-    Card["Pear"].class.should == Card
+    expect(Card["Pear"].class).to eq(Card)
   end
 end
 

data/spec/models/card/trash_spec.rb

@@ -1,14 +1,15 @@
 # -*- encoding : utf-8 -*-
 
+require 'card/action'
 
 describe Card, "deleting card" do
   it "should require permission" do
     a = Card['a']
     Card::Auth.as :anonymous do
-      a.ok?(:delete).should == false
-      a.delete.should == false
-      a.errors[:permission_denied].should_not be_empty
-      Card['a'].trash.should == false
+      expect(a.ok?(:delete)).to eq(false)
+      expect(a.delete).to eq(false)
+      expect(a.errors[:permission_denied]).not_to be_empty
+      expect(Card['a'].trash).to eq(false)
     end
     
   end
@@ -22,13 +23,13 @@ describe Card, "deleted card" do
     end
   end
   it "should be in the trash" do
-    @c.trash.should be_true
+    expect(@c.trash).to be_truthy
   end
   it "should come out of the trash when a plus card is created" do
     Card::Auth.as_bot do
       Card.create(:name=>'A+*acct')
       c = Card[ 'A' ]
-      c.trash.should be_false
+      expect(c.trash).to be_falsey
     end
   end
 end
@@ -38,7 +39,7 @@ describe Card, "in trash" do
     Card.create(:name=>"Betty").delete
     c=Card.fetch "Betty", :new=>{}
     c.save
-    Card["Betty"].should be_instance_of(Card)
+    expect(Card["Betty"]).to be_instance_of(Card)
   end
 end
 
@@ -50,8 +51,8 @@ describe Card, "plus cards" do
       root = Card['zz']
       root.delete
 #      Rails.logger.info "ERRORS = #{root.errors.full_messages*''}"
-      Card.find(c.id).trash.should be_true
-      Card['zz'].should be_nil
+      expect(Card.find(c.id).trash).to be_truthy
+      expect(Card['zz']).to be_nil
     end
   end
 end
@@ -61,7 +62,7 @@ describe Card do
   context "with revisions" do
     before do Card::Auth.as_bot { @c = Card["Wagn Bot"] } end
     it "should not be removable" do
-      @c.delete.should_not be_true
+      expect(@c.delete).not_to be_truthy
     end
   end
 
@@ -72,7 +73,7 @@ describe Card do
       end
     end
     it "should be removable" do
-      @c.delete!.should be_true
+      expect(@c.delete!).to be_truthy
     end
   end
 end
@@ -101,11 +102,11 @@ describe Card, "dependent removal" do
   end
 
   it "should be trash" do
-    @c.trash.should be_true
+    expect(@c.trash).to be_truthy
   end
 
   it "should not be findable by name" do
-    Card["A+B+C"].should == nil
+    expect(Card["A+B+C"]).to eq(nil)
   end
 end
 
@@ -122,13 +123,13 @@ describe Card, "rename to trashed name" do
   end
 
   it "should rename b to a" do
-    @b.name.should == 'A'
+    expect(@b.name).to eq('A')
   end
 
   it "should rename a to a*trash" do
-    (c = Card.find(@a.id)).cardname.to_s.should == 'A*trash'
-    c.name.should == 'A*trash'
-    c.key.should == 'a*trash'
+    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')
   end
 end
 
@@ -142,16 +143,16 @@ describe Card, "sent to trash" do
   end
 
   it "should be trash" do
-    @c.trash.should == true
+    expect(@c.trash).to eq(true)
   end
 
   it "should not be findable by name" do
-    Card["basicname"].should == nil
+    expect(Card["basicname"]).to eq(nil)
   end
 
-  it "should still have revision" do
-    @c.revisions.length.should == 1
-    @c.current_revision.content.should == 'basiccontent'
+  it "should still have actions" do
+    expect(@c.actions.count).to eq(2)
+    expect(@c.last_change_on(:db_content).value).to eq('basiccontent')
   end
 end
 
@@ -165,19 +166,19 @@ describe Card, "revived from trash" do
   end
 
   it "should not be trash" do
-    @c.trash.should == false
+    expect(@c.trash).to eq(false)
   end
 
-  it "should have 2 revisions" do
-    @c.revisions.length.should == 2
+  it "should have 3 actions" do
+    expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old revisions" do
-    @c.revisions[0].content.should == 'basiccontent'
+  it "should still have old content" do
+    expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
   end
 
-  it "should have a new revision" do
-    @c.content.should == 'revived content'
+  it "should have the same content" do
+    expect(@c.content).to eq('revived content')
 #    Card.fetch(@c.name).content.should == 'revived content'
   end
 end
@@ -207,19 +208,19 @@ describe Card, "junction revival" do
   end
 
   it "should not be trash" do
-    @c.trash.should == false
+    expect(@c.trash).to eq(false)
   end
 
-  it "should have 2 revisions" do
-    @c.revisions.length.should == 2
+  it "should have 3 actions" do
+    expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old revisions" do
-    @c.revisions[0].content.should == 'basiccontent'
+  it "should still have old action" do
+    expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
   end
 
-  it "should have a new revision" do
-    @c.content.should == 'revived content'
+  it "should have old content" do
+    expect(@c.db_content).to eq('revived content')
   end
 end