ruby-trello 2.0.1 → 3.0.0

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

@@ -1,36 +1,47 @@
-require 'rubygems'
+require 'bundler/setup'
+require 'dotenv/load'
+require 'trello'
+require 'webmock/rspec'
+require 'stringio'
+require 'vcr'
 
-unless defined? Rubinius
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'pry-byebug' if RUBY_ENGINE != 'jruby'
 
-begin
-  require 'pry-byebug'
-rescue LoadError
-end
+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
 
-# Set up gems listed in the Gemfile.
-begin
-  ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts 'Try running `bundle install`.'
-  exit!
-end
+  config.filter_sensitive_data('DEVELOPER_PUBLIC_KEY') do |interaction|
+    CGI.parse(URI.parse(interaction.request.uri).query)['key'].first
+  end
+  config.filter_sensitive_data('MEMBER_TOKEN') do |interaction|
+    CGI.parse(URI.parse(interaction.request.uri).query)['token'].first
+  end
+  config.filter_sensitive_data('set_cookie_dsc') do |interaction|
+    set_cookie_headers = interaction.response.headers['Set-Cookie']
 
-Bundler.require(:spec)
+    if set_cookie_headers
+      set_cookie_headers.first.scan(/dsc=(\w+)/).flatten.first
+    end
+  end
 
-require 'trello'
-require 'webmock/rspec'
-require 'stringio'
+  uri_without_credentials_matcher = lambda do |match_request, coming_request|
+    without_public_key = -> (uri) { uri.sub(/key=\w+/, 'key=DEVELOPER_PUBLIC_KEY') }
+    without_member_token = -> (uri) { uri.sub(/token=\w+/, 'token=MEMBER_TOKEN') }
+    without_credentials = -> (request) { without_public_key.call(without_member_token.call(request.uri)) }
+
+    without_credentials.call(match_request) == without_credentials.call(coming_request)
+  end
+
+  config.default_cassette_options[:match_requests_on] = [:method, uri_without_credentials_matcher]
+end
 
 Trello.logger = Logger.new(StringIO.new)
 
 RSpec.configure do |rspec|
   rspec.filter_run_excluding broken: true
+  rspec.filter_run_when_matching focus: true
 
   rspec.before :each do
     Trello.reset!
@@ -42,6 +53,41 @@ RSpec.configure do |rspec|
     example.run
     $VERBOSE = verbose
   end
+
+  rspec.failure_color = :magenta
+  rspec.tty = true
+  rspec.color = true
+end
+
+RSpec::Expectations.configuration.on_potential_false_positives = :nothing
+
+module IntegrationHelpers
+  def setup_trello
+    Trello.configure do |config|
+      config.developer_public_key = ENV['TRELLO_DEVELOPER_PUBLIC_KEY'] || 'developerpublickey'
+      config.member_token = ENV['TRELLO_MEMBER_TOKEN'] || 'membertoken'
+    end
+  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
@@ -319,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
 
@@ -425,6 +458,54 @@ module Helpers
     JSON.generate(label_name_details)
   end
 
+  def custom_fields_details
+    [
+      {
+        'id' => 'abcdef123456789123456789',
+        'name' => 'Priority',
+        'idModel' => 'abc123',
+        'type' => 'checkbox',
+        'pos' => 123,
+        'modelType' => 'board'
+      },
+      {
+        id: 'abcdef123456789123456789',
+        name: 'Priority',
+        model_id: 'abc123',
+        type: 'checkbox',
+        pos: 123,
+        model_type: 'board'
+      }
+    ]
+  end
+
+  def custom_fields_payload
+    JSON.generate(custom_fields_details.first)
+  end
+
+  def custom_field_option_details
+    {
+      '_id'   => 'abcdefgh12345678',
+      'value' => {'text' => 'Low Priority'},
+      'color' => 'green',
+      'pos' => 1
+    }
+  end
+
+  def custom_field_item_details
+    {
+      'id' => 'abcdefg1234567',
+      'value' => { 'text' => 'hello world' },
+      'idModel' => 'abcdef123456789123456789',
+      'idCustomField' => 'abcdef123456789123456789',
+      'modelType' => 'card'
+    }
+  end
+
+  def custom_field_items_payload
+    JSON.generate(custom_field_item_details)
+  end
+
   def webhooks_payload
     JSON.generate(webhooks_details)
   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/association_builder/has_many_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe Trello::AssociationBuilder::HasMany do
+
+  describe '.build' do
+    around do |example|
+      class FakeBoard; end
+
+      example.run
+
+      Object.send(:remove_const, 'FakeBoard')
+    end
+
+    it 'build has many finder method' do
+      Trello::AssociationBuilder::HasMany.build(FakeBoard, 'boards', {})
+
+      expect(FakeBoard.new.respond_to?(:boards)).to eq(true)
+    end
+
+    it 'the finder method return result from Trello::AssociationFetcher' do
+      fake_board = FakeBoard.new
+      has_many_fetcher = instance_double(Trello::AssociationFetcher::HasMany)
+      allow(Trello::AssociationFetcher::HasMany)
+        .to receive(:new)
+        .with(fake_board, 'boards', {})
+        .and_return(has_many_fetcher)
+
+      result = double('result')
+      allow(has_many_fetcher).to receive(:fetch).with(a: 1, b: 2).and_return(result)
+
+      Trello::AssociationBuilder::HasMany.build(FakeBoard, 'boards', {})
+      expect(fake_board.boards(a: 1, b: 2)).to eq(result)
+    end
+  end
+
+end

data/spec/unit/trello/association_builder/has_one_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe Trello::AssociationBuilder::HasOne do
+
+  describe '.build' do
+    around do |example|
+      class FakeBoard; end
+
+      example.run
+
+      Object.send(:remove_const, 'FakeBoard')
+    end
+
+    it 'build has one finder method' do
+      Trello::AssociationBuilder::HasOne.build(FakeBoard, 'organization', {})
+
+      expect(FakeBoard.new.respond_to?(:organization)).to eq(true)
+    end
+
+    it 'the finder method return result from Trello::AssociationFetcher' do
+      fake_board = FakeBoard.new
+      has_one_fetcher = instance_double(Trello::AssociationFetcher::HasOne)
+      allow(Trello::AssociationFetcher::HasOne)
+        .to receive(:new)
+        .with(fake_board, 'organization', {})
+        .and_return(has_one_fetcher)
+
+      result = double('result')
+      allow(has_one_fetcher).to receive(:fetch).and_return(result)
+
+      Trello::AssociationBuilder::HasOne.build(FakeBoard, 'organization', {})
+      expect(fake_board.organization).to eq(result)
+    end
+  end
+
+end

data/spec/unit/trello/association_fetcher/has_many/fetch_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+RSpec.describe Trello::AssociationFetcher::HasMany::Fetch do
+
+  describe '.execute' do
+    let(:client) { instance_double(Trello::Client) }
+    let(:association_class) { double('Association Class') }
+    let(:association_owner) { double('association_owner', client: client) }
+    let(:fetch_path) { '/test' }
+    let(:filter_params) { { a: 1 } }
+    let(:resources) { double('resources') }
+    let(:result) { double('result') }
+
+    let(:params) { instance_double('params',
+      association_class: association_class,
+      association_owner: association_owner,
+      fetch_path: fetch_path,
+      filter_params: filter_params
+    ) }
+
+    before do
+      allow(Trello).to receive(:client).and_return(client)
+      allow(client)
+        .to receive(:find_many)
+        .with(association_class, fetch_path, filter_params)
+        .and_return(resources)
+      allow(Trello::MultiAssociation)
+        .to receive(:new)
+        .with(association_owner, resources)
+        .and_return(double('multi-association', proxy: result))
+    end
+
+    it 'return the result from Trello.client and MultiAssociation' do
+      expect(Trello::AssociationFetcher::HasMany::Fetch.execute(params)).to eq(result)
+    end
+  end
+
+end