gillbus 0.16.7 → 0.16.8

data/test/buy_booking_test.rb

@@ -1,7 +1,6 @@
-require "test_helper"
+require 'test_helper'
 
 class BuyBookingTest < Minitest::Test
-
   def response
     Gillbus::BuyBooking::Response.parse_string(File.read('test/responses/buyBooking.xml'))
   end
@@ -11,22 +10,24 @@ class BuyBookingTest < Minitest::Test
     request = Gillbus::BuyBooking::Request.new(
       payment_method: Gillbus::BuyBooking::Request::METHOD_NOCASH,
       ticket_count: 2,
-      ticket_numbers: ["123456", "654321"],
-      order_ids: ["53ec1fc6-e42a-42b2-b94f-1d5b47466526", "53ec1fc6-e42a-42b2-b94f-1d5b47466526"]
+      ticket_numbers: ['123456', '654321'],
+      order_ids: ['53ec1fc6-e42a-42b2-b94f-1d5b47466526', '53ec1fc6-e42a-42b2-b94f-1d5b47466526'],
+    )
+    assert_equal(
+      {
+        paymentMethod: 3,
+        ticketCount: 2,
+        ticketNumber0: '123456',
+        ticketNumber1: '654321',
+        orderId0: '53ec1fc6-e42a-42b2-b94f-1d5b47466526',
+        orderId1: '53ec1fc6-e42a-42b2-b94f-1d5b47466526',
+      },
+      request.params,
     )
-    assert_equal({
-      paymentMethod: 3,
-      ticketCount: 2,
-      ticketNumber0: "123456",
-      ticketNumber1: "654321",
-      orderId0: "53ec1fc6-e42a-42b2-b94f-1d5b47466526",
-      orderId1: "53ec1fc6-e42a-42b2-b94f-1d5b47466526",
-    }, request.params)
   end
 
   def test_response
     assert response.ticket.confirmation
     assert_equal [123456, 654321], response.ticket.position_numbers
   end
-
 end

data/test/buy_tickets_test.rb

@@ -1,7 +1,6 @@
-require "test_helper"
+require 'test_helper'
 
 class BuyTicketsTest < Minitest::Test
-
   def buy_tickets
     Gillbus::BuyTickets::Response.parse_string(File.read('test/responses/buyTickets.xml'))
   end

data/test/cancel_order_test.rb

@@ -1,7 +1,6 @@
-require "test_helper"
+require 'test_helper'
 
 class CancelOrderTest < Minitest::Test
-
   def cancel_order
     Gillbus::CancelOrder::Response.parse_string(File.read('test/responses/cancelOrder.xml'))
   end

data/test/error_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ErrorTest < Minitest::Test
-
   def error_response
     Gillbus::SessionLogin::Response.parse_string(File.read('test/responses/error.xml'))
   end
@@ -17,7 +16,7 @@ class ErrorTest < Minitest::Test
   def test_errorness
     assert error_response.error?
     assert_equal 4, error_response.error_code
-    assert_equal "Session not created error!", error_response.error_message
+    assert_equal 'Session not created error!', error_response.error_message
     assert_equal "We'r fucked", error_response.external_error_message
   end
 
@@ -28,5 +27,4 @@ class ErrorTest < Minitest::Test
   def test_malformed_2_errorness
     assert malformed_response_2.error?
   end
-
 end

data/test/find_order_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class FindOrderTest < Minitest::Test
-
   def find_order
     Gillbus::FindOrder::Response.parse_string(File.read('test/responses/findOrder.xml'))
   end
@@ -11,7 +10,7 @@ class FindOrderTest < Minitest::Test
   end
 
   def test_number
-    assert_equal("14482", find_order.tickets.first.ticket_number)
+    assert_equal('14482', find_order.tickets.first.ticket_number)
   end
 
   def test_total
@@ -27,11 +26,11 @@ class FindOrderTest < Minitest::Test
   end
 
   def test_comission_vat_value
-    assert_equal("18", find_order.tickets.last.commissions.first.vat_value)
+    assert_equal('18', find_order.tickets.last.commissions.first.vat_value)
   end
 
   def test_vat_value
-    assert_equal("0", find_order.tickets.first.vat_value)
+    assert_equal('0', find_order.tickets.first.vat_value)
   end
 
   def test_comission_currency

data/test/get_bus_image_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class GetBusImageTest < Minitest::Test
-
   def get_bus_image
     Gillbus::GetBusImage::Response.parse_string(File.read('test/responses/getBusImage.xml'))
   end

data/test/get_cities_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 
 class GetCitiesTest < Minitest::Test
-
   def get_cities
     Gillbus::GetCities::Response.parse_string(File.read('test/responses/getCities.xml'))
   end
 
   def test_cities
-    assert_equal( 'Афины', get_cities.cities.first.name)
+    assert_equal('Афины', get_cities.cities.first.name)
   end
 end

data/test/get_countries_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 
 class GetCountriesTest < Minitest::Test
-
   def get_countries
     Gillbus::GetCountries::Response.parse_string(File.read('test/responses/getCountries.xml'))
   end
 
   def test_countries
-    assert_equal( "Австрия", get_countries.countries.first.name)
+    assert_equal('Австрия', get_countries.countries.first.name)
   end
 end

data/test/get_dates_new_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class GetDatesNewTest < Minitest::Test
-
   def get_dates_new_empty
     Gillbus::GetDatesNew::Response.parse_string(File.read('test/responses/very_empty.xml'))
   end

data/test/get_order_ticket_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 
 class GetOrderTicketTest < Minitest::Test
-
   def get_order_ticket
     Gillbus::GetOrderTicket::Response.parse_string(File.read('test/responses/getOrderTicket.xml'))
   end
 
   def test_ticket
-    assert_equal( "base64 string", get_order_ticket.ticket)
+    assert_equal('base64 string', get_order_ticket.ticket)
   end
 end

data/test/get_time_table_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class GetTimeTableTest < Minitest::Test
-
   def get_time_table
     Gillbus::GetTimeTable::Response.parse_string(File.read('test/responses/getTimeTable.xml'))
   end

data/test/get_trip_seats_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class GetTripSeatsTest < Minitest::Test
-
   def get_trip_seats
     Gillbus::GetTripSeats::Response.parse_string(File.read('test/responses/getTripSeats.xml'))
   end
@@ -18,9 +17,9 @@ class GetTripSeatsTest < Minitest::Test
     seats = get_trip_seats.seats
     max_x = seats.map(&:x).max
     max_y = seats.map(&:y).max
-    assert_equal( 70, seats.size )
-    assert_equal( 4, max_y )
-    assert_equal( 13, max_x )
+    assert_equal(70, seats.size)
+    assert_equal(4, max_y)
+    assert_equal(13, max_x)
   end
 
   def test_seats_with_segments

data/test/get_trip_segments_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class GetTripSegmentsTest < Minitest::Test
-
   def get_trip_segments
     Gillbus::GetTripSegments::Response.parse_string(File.read('test/responses/getTripSegments.xml'))
   end
@@ -9,10 +8,10 @@ class GetTripSegmentsTest < Minitest::Test
   def test_get_trip_segments
     points = get_trip_segments.points
 
-    assert_equal( 13, points.size )
-    assert_equal( 'Львов', points.first.geography_name )
-    assert_equal( 'Ж/Д вокзал Львів', points.first.name )
-    assert_equal( 'Щецин', points.last.geography_name )
-    assert_equal( 'Автовокзал', points.last.name )
+    assert_equal(13, points.size)
+    assert_equal('Львов', points.first.geography_name)
+    assert_equal('Ж/Д вокзал Львів', points.first.name)
+    assert_equal('Щецин', points.last.geography_name)
+    assert_equal('Автовокзал', points.last.name)
   end
 end

data/test/lock_seats_test.rb

@@ -3,55 +3,65 @@ require 'test_helper'
 class LockSeatsRequestTest < Minitest::Test
   def test_lock_params
     request = Gillbus::LockSeats::Request.new(
-      trip_id: "2457369573939592570",
+      trip_id: '2457369573939592570',
+    )
+    assert_equal(
+      { tripId: '2457369573939592570' },
+      request.params,
     )
-    assert_equal({
-      tripId: "2457369573939592570",
-    }, request.params)
   end
 
   def test_lock_params_with_seats
     request = Gillbus::LockSeats::Request.new(
-      trip_id: "2457369573939592570",
-      seat_ids: ["12", "13"],
+      trip_id: '2457369573939592570',
+      seat_ids: ['12', '13'],
+    )
+    assert_equal(
+      {
+        tripId: '2457369573939592570',
+        seatId0: '12',
+        seatId1: '13',
+      },
+      request.params,
     )
-    assert_equal({
-      tripId: "2457369573939592570",
-      seatId0: "12",
-      seatId1: "13",
-    }, request.params)
   end
 
   def test_lock_params_with_back_seats
     request = Gillbus::LockSeats::Request.new(
-      trip_id: "2457369573939592570",
-      seat_ids: ["12", "13"],
-      back_seat_ids: ["14", "15"],
+      trip_id: '2457369573939592570',
+      seat_ids: ['12', '13'],
+      back_seat_ids: ['14', '15'],
+    )
+    assert_equal(
+      {
+        tripId: '2457369573939592570',
+        seatId0: '12',
+        seatId1: '13',
+        backSeatId0: '14',
+        backSeatId1: '15',
+      },
+      request.params,
     )
-    assert_equal({
-      tripId: "2457369573939592570",
-      seatId0: "12",
-      seatId1: "13",
-      backSeatId0: "14",
-      backSeatId1: "15",
-    }, request.params)
   end
 
   def test_lock_params_with_segments_seats
     request = Gillbus::LockSeats::Request.new(
-      trip_id: "2457369573939592570",
+      trip_id: '2457369573939592570',
       segments_seat_ids: {
-        0 => ["12", "13"],
-        1 => ["14", "15"],
-      }
+        0 => ['12', '13'],
+        1 => ['14', '15'],
+      },
+    )
+    assert_equal(
+      {
+        tripId: '2457369573939592570',
+        segment0seatId0: '12',
+        segment0seatId1: '13',
+        segment1seatId0: '14',
+        segment1seatId1: '15',
+      },
+      request.params,
     )
-    assert_equal({
-      tripId: "2457369573939592570",
-      segment0seatId0: "12",
-      segment0seatId1: "13",
-      segment1seatId0: "14",
-      segment1seatId1: "15",
-    }, request.params)
   end
 end
 
@@ -61,7 +71,7 @@ class LockSeatsResponseTest < Minitest::Test
   end
 
   def test_lock_seats
-    assert_equal( 899, lock_seats.time_limit)
+    assert_equal(899, lock_seats.time_limit)
   end
 
   def test_dictionary

data/test/reserve_tickets_test.rb

@@ -2,21 +2,28 @@ require 'test_helper'
 require 'pry'
 
 class ReserveTicketsTest < Minitest::Test
-
   def reserve_tickets
     Gillbus::ReserveTickets::Response.parse_string(File.read('test/responses/reserveTickets.xml'))
   end
 
   def test_number
-    assert_equal("8472", reserve_tickets.tickets.first.ticket_number)
+    assert_equal('8472', reserve_tickets.tickets.first.ticket_number)
   end
 
   def test_total
-    assert_equal(Money.new(110_00, "UAH"), reserve_tickets.tickets.first.total_amount)
+    assert_equal(Money.new(110_00, 'UAH'), reserve_tickets.tickets.first.total_amount)
   end
 
   def test_date_to_pay
     assert_equal(DateTime.new(2013, 5, 22, 20, 30, 0, '+3'), reserve_tickets.tickets.first.date_to_pay)
   end
 
+  def test_date_to_pay_with_timezone
+    tickets = Gillbus::ReserveTickets::Response.parse_string(
+      File.read('test/responses/reserveTickets.xml'),
+      timezone: 'Europe/Moscow',
+    )
+    assert_equal(DateTime.new(2013, 5, 22, 20, 30, 0, '+4'), tickets.tickets.first.date_to_pay)
+    assert_equal('MSK', tickets.tickets.first.date_to_pay.zone)
+  end
 end

data/test/return_position_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'test_helper'
 
 class ReturnPositionTest < Minitest::Test
   def test_request
@@ -7,10 +7,13 @@ class ReturnPositionTest < Minitest::Test
       system_numbers: [123456],
     )
 
-    assert_equal({
-      ticketCount: 1,
-      systemNumber0: 123456,
-    }, request.params)
+    assert_equal(
+      {
+        ticketCount: 1,
+        systemNumber0: 123456,
+      },
+      request.params,
+    )
   end
 
   def test_success_response

data/test/search_trips_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class SearchTripsRequestTest < Minitest::Test
-
   def test_params
     req = Gillbus::SearchTrips::Request.new(
       start_date_search: Date.new(2013, 2, 4),
@@ -21,14 +20,14 @@ class SearchTripsRequestTest < Minitest::Test
           student_year: 2,
           isic: 'ISIC#2',
           with_seat: false,
-        }
+        },
       ],
     )
 
     expected_params = {
-      startDateSearch: "04.02.2013",
-      selectedModes: "3;8",
-      roundTrip: "1",
+      startDateSearch: '04.02.2013',
+      selectedModes: '3;8',
+      roundTrip: '1',
       passenger0birthday: '01.01.1990',
       passenger0studentTicket: 'STUDENTTICKET#1',
       passenger0studentYear: 1,
@@ -43,11 +42,9 @@ class SearchTripsRequestTest < Minitest::Test
 
     assert_equal expected_params, req.params
   end
-
 end
 
 class SearchTripsResponseTest < Minitest::Test
-
   def get_empty_search_trips
     Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-empty.xml'))
   end
@@ -83,9 +80,9 @@ class SearchTripsResponseTest < Minitest::Test
 
   def test_fields_parsing
     response = get_successful_search_trips
-    assert_equal Date.new(2014,8,23), response.trips.first.start_date
-    assert_equal Money.new(1410_00, "RUB"), response.trips.first.total_cost
-    assert_equal Money.new(1410_00, "RUB"), response.trips.first.tariffs.first.cost
+    assert_equal Date.new(2014, 8, 23), response.trips.first.start_date
+    assert_equal Money.new(1410_00, 'RUB'), response.trips.first.total_cost
+    assert_equal Money.new(1410_00, 'RUB'), response.trips.first.tariffs.first.cost
     assert_equal 'Europe/Moscow', response.trips.first.start_timezone
     assert_equal 'Europe/Moscow', response.trips.first.end_timezone
     assert_equal true, response.trips.first.fake_time_in_road
@@ -114,29 +111,29 @@ class SearchTripsResponseTest < Minitest::Test
 
     services = {
       1 => 'Кофе',
-      15 => 'Wi-Fi'
+      15 => 'Wi-Fi',
     }
     luggage_options = [
       'В стоимость входит провоз 2 единиц багажа свыше 80 кг.',
       'Ручная кладь 20см x 40см x 30см входит в стоимость билета.',
-      'Превышение по багажу оплачивается в размере 1% от стоимости тарифа.'
+      'Превышение по багажу оплачивается в размере 1% от стоимости тарифа.',
     ]
     seating_options = [
-      'Свободная рассадка.'
+      'Свободная рассадка.',
     ]
     technical_stops = [
-      'Технические остановки осуществляются каждые 2-3 часа.'
+      'Технические остановки осуществляются каждые 2-3 часа.',
     ]
     critical_info = [
-      'ВНИМАНИЕ: Особые условия паспортного режима пересечения пропускного пункта (только с паспортами РБ и РФ).'
+      'ВНИМАНИЕ: Особые условия паспортного режима пересечения пропускного пункта (только с паспортами РБ и РФ).',
     ]
     resource_options = [
-      'Посадка начинается за 10 мин.'
+      'Посадка начинается за 10 мин.',
     ]
     other_options = [
       'Переправа',
       'Трансфер',
-      'Cкидка при покупке раунд-трипа'
+      'Cкидка при покупке раунд-трипа',
     ]
 
     assert_equal services.values, options.services.map(&:name)
@@ -173,7 +170,7 @@ class SearchTripsResponseTest < Minitest::Test
   def test_faking_response
     trip = Gillbus::Trip.new(
       id: '12345',
-      start_date: Date.today
+      start_date: Date.today,
     )
     assert_equal '12345', trip.id
     assert_equal Date.today, trip.start_date
@@ -188,5 +185,4 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal true, response.trips.first.fake_time_in_road
     assert_equal 2, response.trips.first.segments.size
   end
-
 end