ruby-trello 2.3.1 → 3.0.0

data/spec/label_spec.rb

@@ -20,7 +20,7 @@ module Trello
       it "delegates to Trello.client#find" do
         expect(client)
           .to receive(:find)
-          .with(:label, 'abcdef123456789123456789', {})
+          .with('label', 'abcdef123456789123456789', {})
 
         Label.find('abcdef123456789123456789')
       end
@@ -43,7 +43,6 @@ module Trello
         expect(label.color).to    eq details['color']
         expect(label.name).to     eq details['name']
         expect(label.id).to       eq details['id']
-        expect(label.uses).to     eq details['uses']
         expect(label.board_id).to eq details['idBoard']
       end
 
@@ -71,14 +70,16 @@ module Trello
 
         result = JSON.generate(cards_details.first.merge(payload.merge(idBoard: boards_details.first['id'])))
 
-        expected_payload = {name: "Test Label", color: nil, idBoard: "abcdef123456789123456789" }
+        expected_payload = {'name' => 'Test Label', 'color' => 'yellow', 'idBoard' => 'abcdef123456789123456789' }
 
-        expect(client)
+        expect(Label.client)
           .to receive(:post)
-          .with("/labels", expected_payload)
+          .with('/labels', expected_payload)
           .and_return result
 
-        label = Label.create(label_details.first.merge(payload.merge(board_id: boards_details.first['id'])))
+        params = label_details.first.merge(payload.merge(board_id: boards_details.first['id']))
+        params.delete('id')
+        label = Label.create params
 
         expect(label).to be_a Label
       end
@@ -89,13 +90,19 @@ module Trello
         expected_new_name = "xxx"
 
         payload = {
-          name: expected_new_name,
+          'name' => expected_new_name,
         }
 
         expect(client)
           .to receive(:put)
           .once
           .with("/labels/abcdef123456789123456789", payload)
+          .and_return({
+            "id" => "abcdef123456789123456789",
+            "idBoard" => "5e70f5bed3f34a49e2f11409",
+            "name" => "xxx",
+            "color" => "purple"
+          }.to_json)
 
         label.name = expected_new_name
         label.save
@@ -105,13 +112,19 @@ module Trello
         expected_new_color = "purple"
 
         payload = {
-          color: expected_new_color,
+          'color' => expected_new_color
         }
 
         expect(client)
           .to receive(:put)
           .once
           .with("/labels/abcdef123456789123456789", payload)
+          .and_return({
+            "id" => "abcdef123456789123456789",
+            "idBoard" => "5e70f5bed3f34a49e2f11409",
+            "name" => "",
+            "color" => "purple"
+          }.to_json)
 
         label.color = expected_new_color
         label.save
@@ -121,26 +134,19 @@ module Trello
         %w(green yellow orange red purple blue sky lime pink black).each do |color|
           allow(client)
             .to receive(:put)
-            .with("/labels/abcdef123456789123456789", {color: color})
-            .and_return "not important"
+            .with("/labels/abcdef123456789123456789", {'color' => color})
+            .and_return({
+              "id" => "abcdef123456789123456789",
+              "idBoard" => "5e70f5bed3f34a49e2f11409",
+              "name" => "",
+              "color" => color
+            }.to_json)
 
           label.color = color
           label.save
           expect(label.errors).to be_empty
         end
       end
-
-      it "throws an error when trying to update a label with an unknown colour" do
-        allow(client)
-          .to receive(:put)
-          .with("/labels/abcdef123456789123456789", {})
-          .and_return "not important"
-
-        label.color = 'mauve'
-        label.save
-
-        expect(label.errors.full_messages.to_sentence).to eq("Label color 'mauve' does not exist")
-      end
     end
 
     context "deleting" do
@@ -162,10 +168,6 @@ module Trello
         expect(label.name).to_not be_nil
       end
 
-      it "gets its usage" do
-        expect(label.uses).to_not be_nil
-      end
-
       it "gets its color" do
         expect(label.color).to_not be_nil
       end
@@ -188,8 +190,7 @@ module Trello
           'id' => 'id',
           'name' => 'name',
           'color' => 'color',
-          'idBoard' => 'board_id',
-          'uses' => 'uses'
+          'idBoard' => 'board_id'
         }
 
         label = Label.new(expected)
@@ -207,8 +208,7 @@ module Trello
         'id' => 'id',
         'name' => 'name',
         'color' => 'color',
-        'idBoard' => 'board_id',
-        'uses' => 'uses'
+        'idBoard' => 'board_id'
       }}
       let(:label) { Label.new(label_detail) }
 
@@ -222,7 +222,6 @@ module Trello
           expect(label.name).to eq label_detail['name']
           expect(label.color).to eq label_detail['color']
           expect(label.board_id).to eq label_detail['idBoard']
-          expect(label.uses).to eq label_detail['uses']
         end
       end
 
@@ -252,7 +251,7 @@ module Trello
             expect(label.name).to eq(label_detail['name'])
           end
 
-          it "label hasn't been mark as changed", pending: true do
+          it "label hasn't been mark as changed" do
             label.update_fields(fields)
 
             expect(label.changed?).to be_falsy
@@ -269,7 +268,6 @@ module Trello
             expect(label.name).to eq label_detail['name']
             expect(label.color).to eq label_detail['color']
             expect(label.board_id).to eq label_detail['idBoard']
-            expect(label.uses).to eq label_detail['uses']
           end
 
           it "label hasn't been mark as changed" do

data/spec/list_spec.rb

@@ -84,11 +84,10 @@ module Trello
         result = JSON.generate(payload)
 
         expected_payload = {
-          name: 'Test List',
-          closed: false,
-          idBoard: 'abcdef123456789123456789',
-          pos: 42,
-          idListSource: 'abcdef123456789'
+          'name' => 'Test List',
+          'pos' => 42,
+          'idBoard' => 'abcdef123456789123456789',
+          'idListSource' => 'abcdef123456789'
         }
 
         expect(client)
@@ -105,15 +104,14 @@ module Trello
         expected_new_name = 'xxx'
 
         payload = {
-          name: expected_new_name,
-          closed: false,
-          pos: list.pos
+          'name' => expected_new_name
         }
 
         expect(client)
           .to receive(:put)
           .once
           .with('/lists/abcdef123456789123456789', payload)
+          .and_return({}.to_s)
 
         list.name = expected_new_name
         list.save
@@ -122,15 +120,14 @@ module Trello
       it 'updates position' do
         new_position = 42
         payload = {
-          name: list.name,
-          closed: list.closed,
-          pos: new_position
+          'pos' => new_position
         }
 
         expect(client)
           .to receive(:put)
           .once
           .with('/lists/abcdef123456789123456789', payload)
+          .and_return({}.to_s)
 
         list.pos = new_position
         list.save
@@ -220,10 +217,9 @@ module Trello
           .to receive(:put)
           .once
           .with('/lists/abcdef123456789123456789', {
-            name: list.name,
-            closed: true,
-            pos: list.pos
+            'closed' => true
           })
+          .and_return({}.to_s)
 
         list.close!
       end
@@ -249,5 +245,27 @@ module Trello
         end
       end
     end
+
+    describe '#move_to_board' do
+      let(:board) { Trello::Board.new(id: 'someid') }
+      context 'given the destination board parameter is a Trello::Board instance' do
+        it 'moves to the destination board' do
+          expect(client)
+            .to receive(:put)
+            .with("/lists/#{list.id}/idBoard", value: 'someid')
+
+          list.move_to_board(board)
+        end
+      end
+      context 'given the destination board parameter is an id string' do
+        it 'moves to the destination board' do
+          expect(client)
+            .to receive(:put)
+            .with("/lists/#{list.id}/idBoard", value: 'someid')
+
+          list.move_to_board(board.id)
+        end
+      end
+    end
   end
 end

data/spec/notification_spec.rb

@@ -82,7 +82,7 @@ module Trello
           .with("/members/#{user_details['id']}", {})
           .and_return user_payload
 
-        expect(notification.member_creator.id).to eq user_details['id']
+        expect(notification.creator.id).to eq user_details['id']
       end
     end
 
@@ -115,7 +115,7 @@ module Trello
       end
 
       it "gets the member creator id" do
-        expect(notification.member_creator_id).to eq notification_details['idMemberCreator']
+        expect(notification.creator_id).to eq notification_details['idMemberCreator']
       end
     end
 
@@ -127,7 +127,7 @@ module Trello
           'type' => 'type',
           'date' => 'date',
           'data' => 'data',
-          'idMemberCreator' => 'member_creator_id'
+          'idMemberCreator' => 'creator_id'
         }
 
         notification = Notification.new(expected)

data/spec/organization_spec.rb

@@ -47,14 +47,15 @@ module Trello
           'id' => 'id',
           'name' => 'name',
           'displayName' => 'display_name',
+          'descData' => 'desc_data',
+          'website' => 'website',
+          'teamType' => 'team_type',
           'desc' => 'description',
           'url' => 'url',
-          'invited' => 'invited',
-          'website' => 'website',
           'logoHash' => 'logo_hash',
-          'billableMemberCount' => 'billable_member_count',
-          'activeBillableMemberCount' => 'active_billable_member_count',
-          'memberships' => 'memberships'
+          'logoUrl' => 'logo_url',
+          'products' => 'products',
+          'powerUps' => 'power_ups'
         }
 
         organization = Organization.new(expected)

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'vcr'
 require 'pry-byebug' if RUBY_ENGINE != 'jruby'
 
 VCR.configure do |config|
+  config.default_cassette_options = { match_requests_on: %i[uri method body] }
   config.cassette_library_dir = 'spec/cassettes'
   config.hook_into :webmock
 
@@ -69,6 +70,26 @@ module IntegrationHelpers
   end
 end
 
+RSpec::Matchers.define :match_hash_with_indifferent_access do |expected|
+  match do |actual|
+    actual.with_indifferent_access == expected.with_indifferent_access
+  end
+
+  failure_message do |actual|
+    <<~EOF
+    expected: #{expected}
+         got: #{actual}
+    EOF
+  end
+
+  failure_message_when_negated do |actual|
+    <<~EOF
+    expected: value != #{expected}
+         got:          #{actual}
+    EOF
+  end
+end
+
 module Helpers
   def user_details
     {
@@ -344,20 +365,7 @@ module Helpers
     {
         'id' => '4ee7e59ae582acdec8000291',
         'name' => 'publicorg',
-        'desc' => 'This is a test organization',
-        'members' => [{
-            'id' => '4ee7df3ce582acdec80000b2',
-            'username' => 'alicetester',
-            'fullName' => 'Alice Tester'
-        }, {
-            'id' => '4ee7df74e582acdec80000b6',
-            'username' => 'davidtester',
-            'fullName' => 'David Tester'
-        }, {
-            'id' => '4ee7e2e1e582acdec8000112',
-            'username' => 'edtester',
-            'fullName' => 'Ed Tester'
-        }]
+        'desc' => 'This is a test organization'
     }
   end
 

data/spec/token_spec.rb

@@ -69,20 +69,19 @@ module Trello
 
     describe "#update_fields" do
       it "does not set any fields when the fields argument is empty" do
-        expected = {
-          'id' => 'id',
-          'idMember' => 'member_id',
-          'permissions' => 'permissions',
-          'webhooks' => 'webhooks'
-        }
-
-        token = Token.new(expected)
+        token = Token.new({
+          'id' => 'aaa',
+          'idMember' => 'ccc',
+          'permissions' => {},
+          'webhooks' => []
+        })
 
         token.update_fields({})
 
-        expected.each do |key, value|
-          expect(token.send(value)).to eq expected[key]
-        end
+        expect(token.id).to eq('aaa')
+        expect(token.member_id).to eq('ccc')
+        expect(token.permissions).to eq({})
+        expect(token.webhooks).to eq([])
       end
     end
   end

data/spec/unit/trello/basic_data_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Trello::BasicData do
 
-  describe '.register_attributes' do
+  describe '.schema' do
     around do |example|
       module Trello
         class FakeCard < BasicData
@@ -14,14 +14,73 @@ RSpec.describe Trello::BasicData do
       Trello.send(:remove_const, 'FakeCard')
     end
 
-    it 'call execute on RegisterAttributes' do
-      expect(Trello::RegisterAttributes)
-        .to receive(:execute)
-        .with(Trello::FakeCard, [:id, :name, :desc], [:id, :name])
+    before { allow(Trello::FakeCard).to receive(:register_attrs) }
+
+    it 'call instance_eval on a schema instance' do
+      expect_any_instance_of(Trello::Schema).to receive(:instance_eval)
+
+      Trello::FakeCard.class_eval do
+        schema do
+          'PlaceHolder'
+        end
+      end
+    end
+
+    it 'call register_attrs on model' do
+      allow_any_instance_of(Trello::Schema).to receive(:instance_eval)
+      expect(Trello::FakeCard).to receive(:register_attrs)
 
       Trello::FakeCard.class_eval do
-        register_attributes :id, :name, :desc, readonly: [:id, :name]
+        schema do
+          'PlaceHolder'
+        end
+      end
+    end
+
+    it 'return the @schema if it exist' do
+      Trello::FakeCard.class_eval do
+        schema do
+          'PlaceHolder'
+        end
       end
+
+      expect(Trello::Schema).not_to receive(:new)
+      expect(Trello::FakeCard.schema).to be_a(Trello::Schema)
+    end
+  end
+
+  describe '.register_attrs' do
+    around do |example|
+      module Trello
+        class FakeCard < BasicData
+        end
+      end
+  
+      example.run
+  
+      Trello.send(:remove_const, 'FakeCard')
+    end
+  
+    let(:attribute_1) { double('attribute 1') }
+    let(:attribute_2) { double('attribute 2') }
+    let(:attribute_3) { double('attribute 3') }
+  
+    let(:schema) { double('Trello::Schema',
+      attrs: {
+        name: attribute_1,
+        desc: attribute_2,
+        url: attribute_3
+      }
+    ) }
+  
+    before { allow(Trello::FakeCard).to receive(:schema).and_return(schema) }
+  
+    it 'will call register on each attributes' do
+      expect(attribute_1).to receive(:register).with(Trello::FakeCard)
+      expect(attribute_2).to receive(:register).with(Trello::FakeCard)
+      expect(attribute_3).to receive(:register).with(Trello::FakeCard)
+  
+      Trello::FakeCard.register_attrs
     end
   end
 
@@ -30,7 +89,7 @@ RSpec.describe Trello::BasicData do
     let(:association_options) { { test: 'test' } }
 
     it 'call build on AssociationBuilder::HasMany' do
-      expect(AssociationBuilder::HasMany)
+      expect(Trello::AssociationBuilder::HasMany)
         .to receive(:build)
         .with(Trello::BasicData, association_name, association_options)
 
@@ -43,7 +102,7 @@ RSpec.describe Trello::BasicData do
     let(:association_options) { { path: 'test' } }
 
     it 'call build on AssociationBuilder::HasOne' do
-      expect(AssociationBuilder::HasOne)
+      expect(Trello::AssociationBuilder::HasOne)
         .to receive(:build)
         .with(Trello::BasicData, association_name, association_options)