ruby-trello 1.2.1 → 1.3.0

data/spec/array_spec.rb

@@ -5,6 +5,6 @@ describe Array, '#jsoned_into' do
   include Helpers
 
   it "should convert an array of parsed json into cards" do
-    cards_details.jsoned_into(Trello::Card).should eq([cards_details.first.jsoned_into(Trello::Card)])
+    expect(cards_details.jsoned_into(Trello::Card)).to eq([cards_details.first.jsoned_into(Trello::Card)])
   end
 end

data/spec/association_spec.rb

@@ -7,16 +7,20 @@ module Trello
     let(:organization) { client.find(:organization, '4ee7e59ae582acdec8000291') }
     let(:client) { Client.new(consumer_key: 'xxx') }
 
-    before(:each) do
-      client.stub(:get).with('/organizations/4ee7e59ae582acdec8000291', {}).
-        and_return organization_payload
-      client.stub(:get).with('/organizations/4ee7e59ae582acdec8000291/boards/all').
-        and_return boards_payload
+    before do
+      allow(client)
+        .to receive(:get)
+        .with('/organizations/4ee7e59ae582acdec8000291', {})
+        .and_return organization_payload
+
+      allow(client)
+        .to receive(:get)
+        .with('/organizations/4ee7e59ae582acdec8000291/boards/all')
+        .and_return boards_payload
     end
 
     it 'should set the proper client for all associated boards of the organization' do
-      organization.boards.first.client.consumer_key.should == 'xxx'
+      expect(organization.boards.first.client.consumer_key).to eq 'xxx'
     end
-
   end
 end

data/spec/basic_auth_policy_spec.rb

@@ -21,8 +21,8 @@ describe BasicAuthPolicy do
 
     the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
 
-    the_query_parameters['key'].should === 'xxx_developer_public_key_xxx'
-    the_query_parameters['token'].should === 'xxx_member_token_xxx'
+    expect(the_query_parameters['key']).to eq 'xxx_developer_public_key_xxx'
+    expect(the_query_parameters['token']).to eq 'xxx_member_token_xxx'
   end
 
   it 'preserves other query parameters' do
@@ -34,7 +34,7 @@ describe BasicAuthPolicy do
 
     the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
 
-    the_query_parameters['name'].should == 'Phil'
+    expect(the_query_parameters['name']).to eq 'Phil'
   end
 
   it 'preserves headers' do
@@ -44,7 +44,7 @@ describe BasicAuthPolicy do
 
     authorized_request = BasicAuthPolicy.authorize request
 
-    authorized_request.headers.should === request.headers
+    expect(authorized_request.headers).to eq request.headers
   end
 
   it 'does what when a query parameter already exists called key or token?'

data/spec/board_spec.rb

@@ -8,169 +8,228 @@ module Trello
     let(:client) { Client.new }
     let(:member) { Member.new(user_payload) }
 
-    before(:each) do
-      client.stub(:get).with("/boards/abcdef123456789123456789", {}).
-        and_return JSON.generate(boards_details.first)
+    before do
+      allow(client)
+        .to receive(:get)
+        .with("/boards/abcdef123456789123456789", {})
+        .and_return JSON.generate(boards_details.first)
     end
 
     context "finding" do
       let(:client) { Trello.client }
 
       it "delegates to client#find" do
-        client.should_receive(:find).with(:board, 'abcdef123456789123456789', {})
+        expect(client)
+          .to receive(:find)
+          .with(:board, 'abcdef123456789123456789', {})
+
         Board.find('abcdef123456789123456789')
       end
 
       it "is equivalent to client#find" do
-        Board.find('abcdef123456789123456789').should eq(board)
+        expect(Board.find('abcdef123456789123456789')).to eq(board)
       end
     end
 
     context "self.all" do
       let(:client) { Trello.client }
 
-      it "gets all boards" do
-        Member.stub_chain(:find, :username).and_return "testuser"
-        client.stub(:get).with("/members/testuser/boards").and_return boards_payload
+      before do
+        allow(Member)
+          .to receive_message_chain(:find, :username)
+          .and_return "testuser"
+
+        allow(client)
+          .to receive(:get)
+          .with("/members/testuser/boards")
+          .and_return boards_payload
+      end
 
-        expected = Board.new(boards_details.first)
-        Board.all.first.should eq(expected)
+      it "gets all boards" do
+        expect(Board.all.first).to eq Board.new(boards_details.first)
       end
     end
 
     context "fields" do
       it "gets an id" do
-        board.id.should_not be_nil
+        expect(board.id).to_not be_nil
       end
 
       it "gets a name" do
-        board.name.should_not be_nil
+        expect(board.name).to_not be_nil
       end
 
       it "gets the description" do
-        board.description.should_not be_nil
+        expect(board.description).to_not be_nil
       end
 
       it "knows if it is closed or open" do
-        board.closed?.should_not be_nil
+        expect(board).to_not be_closed
       end
-      
+
       it "knows if it is starred or not" do
-        board.starred?.should_not be_nil
+        expect(board).to_not be_starred
       end
 
       it "gets its url" do
-        board.url.should_not be_nil
+        expect(board.url).to_not be_nil
       end
     end
 
     context "actions" do
-      it "has a list of actions" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/actions", {filter: :all}).
-          and_return actions_payload
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/actions", {filter: :all})
+          .and_return actions_payload
+      end
 
-        board.actions.count.should be > 0
+      it "has a list of actions" do
+        expect(board.actions.count).to be > 0
       end
     end
 
     context "cards" do
-      it "gets its list of cards" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/cards", { filter: :open }).
-          and_return cards_payload
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/cards", {filter: :open})
+          .and_return cards_payload
+      end
 
-        board.cards.count.should be > 0
+      it "gets its list of cards" do
+        expect(board.cards.count).to be > 0
       end
     end
 
     context "labels" do
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/labels")
+          .and_return label_payload
+
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/labelnames")
+          .and_return label_name_payload
+      end
+
       it "gets the specific labels for the board" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/labels").
+        client.stub(:get).with("/boards/abcdef123456789123456789/labels", {}).
           and_return label_payload
-        labels = board.labels false
+        labels = board.labels
         labels.count.should eq(4)
 
-
         expect(labels[2].color).to  eq('red')
         expect(labels[2].id).to  eq('abcdef123456789123456789')
         expect(labels[2].board_id).to  eq('abcdef123456789123456789')
         expect(labels[2].name).to  eq('deploy')
         expect(labels[2].uses).to  eq(2)
-
         expect(labels[3].color).to  eq('blue')
         expect(labels[3].id).to  eq('abcdef123456789123456789')
         expect(labels[3].board_id).to  eq('abcdef123456789123456789')
         expect(labels[3].name).to  eq('on hold')
         expect(labels[3].uses).to  eq(6)
       end
-
-      it "gets the specific labels for the board" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/labelnames").
-          and_return label_name_payload
-
-        board.labels.count.should eq(10)
-      end
     end
 
     context "find_card" do
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/cards/1")
+          .and_return card_payload
+      end
+
       it "gets a card" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/cards/1").
-          and_return card_payload
-        board.find_card(1).should be_a(Card)
+        expect(board.find_card(1)).to be_a(Card)
       end
     end
 
     context "add_member" do
+      before do
+        allow(client)
+          .to receive(:put)
+      end
+
       it "adds a member to the board as a normal user (default)" do
-        client.stub(:put).with("/boards/abcdef123456789123456789/members/id", type: :normal)
+        expect(client)
+          .to receive(:put)
+          .with("/boards/abcdef123456789123456789/members/id", type: :normal)
+
         board.add_member(member)
       end
 
       it "adds a member to the board as an admin" do
-        client.stub(:put).with("/boards/abcdef123456789123456789/members/id", type: :admin)
+        expect(client)
+          .to receive(:put)
+          .with("/boards/abcdef123456789123456789/members/id", type: :admin)
+
         board.add_member(member, :admin)
       end
     end
 
     context "remove_member" do
+      before do
+        allow(client)
+          .to receive(:delete)
+      end
+
       it "removes a member from the board" do
-        client.stub(:delete).with("/boards/abcdef123456789123456789/members/id")
+        expect(client)
+          .to receive(:delete)
+          .with("/boards/abcdef123456789123456789/members/id")
+
         board.remove_member(member)
       end
     end
 
     context "lists" do
-      it "has a list of lists" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/lists", hash_including(filter: :open)).
-          and_return lists_payload
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/lists", hash_including(filter: :open))
+          .and_return lists_payload
+      end
 
-        board.has_lists?.should be true
+      it "has a list of lists" do
+        expect(board).to be_has_lists
       end
     end
 
     context "members" do
-      it "has a list of members" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/members", hash_including(filter: :all)).
-          and_return JSON.generate([user_details])
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/members", hash_including(filter: :all))
+          .and_return JSON.generate([user_details])
+      end
 
-        board.members.count.should be > 0
+      it "has a list of members" do
+        expect(board.members.count).to be > 0
       end
     end
 
     context "organization" do
-      it "belongs to an organization" do
-        client.stub(:get).with("/organizations/abcdef123456789123456789", {}).
-          and_return JSON.generate(orgs_details.first)
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/organizations/abcdef123456789123456789", {})
+          .and_return JSON.generate(orgs_details.first)
+      end
 
-        board.organization.should_not be_nil
+      it "belongs to an organization" do
+        expect(board.organization).to_not be_nil
       end
     end
 
     it "is not closed" do
-      expect(board.closed?).not_to be(true)
+      expect(board).not_to be_closed
     end
-    
-     it "is not starred" do
-      expect(board.starred?).not_to be(true)
+
+    it "is not starred" do
+      expect(board).not_to be_starred
     end
 
     describe "#update_fields" do
@@ -192,12 +251,12 @@ module Trello
 
         expected.each_pair do |key, value|
           if board.respond_to?(key)
-            board.send(key).should == value
+            expect(board.send(key)).to eq value
           end
         end
 
-        board.description.should == expected['desc']
-        board.organization_id.should == expected['idOrganization']
+        expect(board.description).to eq expected['desc']
+        expect(board.organization_id).to eq expected['idOrganization']
       end
 
       it "sets any attributes supplied in the fields argument"
@@ -210,45 +269,47 @@ module Trello
         JSON.generate(boards_details.first)
       end
 
-      it "cannot currently save a new instance" do
-        client.should_not_receive :put
+      before do
+        allow(client)
+          .to receive(:put)
+      end
 
-        the_new_board = Board.new
-        -> { the_new_board.save }.should raise_error
+      it "cannot currently save a new instance" do
+        expect(client).to_not receive(:put)
+        expect {
+          Board.new.save
+        }.to raise_error
       end
 
       it "puts all fields except id" do
         expected_fields = %w{ name description closed starred idOrganization}.map { |s| s.to_sym }
 
-        client.should_receive(:put) do |anything, body|
-          body.keys.should =~ expected_fields
+        expect(client).to receive(:put) do |anything, body|
+          expect(body.keys).to match expected_fields
           any_board_json
         end
 
-        the_new_board = Board.new 'id' => "xxx"
-        the_new_board.save
+        Board.new('id' => "xxx").save
       end
 
       it "mutates the current instance" do
-        client.stub(:put).and_return any_board_json
+        allow(client)
+          .to receive(:put)
+          .and_return any_board_json
 
         board = Board.new 'id' => "xxx"
-
-        the_result_of_save = board.save
-
-        the_result_of_save.should equal board
+        expect(board.save).to eq board
       end
 
       it "uses the correct resource" do
         expected_resource_id = "xxx_board_id_xxx"
 
-        client.should_receive(:put) do |path, anything|
-          path.should =~ /#{expected_resource_id}\/$/
+        expect(client).to receive(:put) do |path, anything|
+          expect(path).to match(/#{expected_resource_id}\/\z/)
           any_board_json
         end
 
-        the_new_board = Board.new 'id' => expected_resource_id
-        the_new_board.save
+        Board.new('id' => expected_resource_id).save
       end
 
       it "saves OR updates depending on whether or not it has an id set"
@@ -267,15 +328,18 @@ module Trello
         board.name        = "new name"
         board.description = "new description"
         board.closed      = true
-        board.starred      = true
-
-        client.should_receive(:put).with("/boards/#{board.id}/", {
-          name: "new name",
-          description: "new description",
-          closed: true,
-          starred: true,
-          idOrganization: nil
-        }).and_return any_board_json
+        board.starred     = true
+
+        expect(client)
+          .to receive(:put)
+          .with("/boards/#{board.id}/", {
+            name: "new name",
+            description: "new description",
+            closed: true,
+            starred: true,
+            idOrganization: nil })
+          .and_return any_board_json
+
         board.update!
       end
     end
@@ -289,26 +353,39 @@ module Trello
         JSON.generate(boards_details.first)
       end
 
+      before do
+        allow(client)
+          .to receive(:post)
+      end
+
       it "creates a new board with whatever attributes are supplied " do
         expected_attributes = { name: "Any new board name", description: "Any new board desription" }
         sent_attributes = { name: expected_attributes[:name], desc: expected_attributes[:description] }
 
-        client.should_receive(:post).with("/boards", sent_attributes).and_return any_board_json
+        expect(client)
+          .to receive(:post)
+          .with("/boards", sent_attributes)
+          .and_return any_board_json
 
         Board.create expected_attributes
       end
 
       it "posts to the boards collection" do
-        client.should_receive(:post).with("/boards", anything).and_return any_board_json
+        expect(client)
+          .to receive(:post)
+          .with("/boards", anything)
+          .and_return any_board_json
 
         Board.create xxx: ""
       end
 
       it "returns a board" do
-        client.stub(:post).with("/boards", anything).and_return any_board_json
+        allow(client)
+          .to receive(:post)
+          .with("/boards", anything)
+          .and_return any_board_json
 
-        the_new_board = Board.create xxx: ""
-        the_new_board.should be_a Board
+        expect(Board.create(xxx: "")).to be_a Board
       end
 
       it "at least name is required"