Update tests and factories

spec/factories/airports.rb

@@ -15,23 +15,23 @@
     code { "TOP" }
     location { "Springfield, US" }
 
-    trait :east_coast do
+    trait :new_york_city do
       code { "NYC" }
     end
 
-    trait :north_california do
+    trait :san_francisco do
       code { "SFO" }
     end
 
-    trait :south_california do
+    trait :los_angeles do
       code { "LAX" }
     end
 
-    trait :atlanta_layover do
+    trait :atlanta do
       code { "ATL" }
     end
 
-    trait :chicago_layover do
+    trait :chicago do
       code { "ORD" }
     end
   end

spec/models/passenger_spec.rb

@@ -20,4 +20,9 @@
     it { is_expected.to belong_to(:booking) }
     it { is_expected.to have_many(:flights).through(:booking) }
   end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:email) }
+  end
 end

spec/requests/bookings_request_spec.rb

@@ -2,6 +2,11 @@
 
 require 'rails_helper'
 
-# RSpec.describe "Bookings", type: :request do
+RSpec.describe "Bookings", type: :request do
+  it "handles a missing booking correctly" do
+    get booking_path("not-here")
 
-# end
+    expect(response).to redirect_to(root_url)
+    expect(flash[:alert]).to eq("Sorry, this booking does not exist.")
+  end
+end

spec/services/booking_options_spec.rb

@@ -3,10 +3,10 @@
 require "rails_helper"
 
 RSpec.describe BookingOptions do
-  let(:san_fran) { create(:airport, :north_california) }
-  let(:new_york) { create(:airport, :east_coast) }
-  let(:atlanta) { create(:airport, :atlanta_layover) }
-  let(:chicago) { create(:airport, :chicago_layover) }
+  let(:san_fran) { create(:airport, :san_francisco) }
+  let(:new_york) { create(:airport, :new_york_city) }
+  let(:atlanta) { create(:airport, :atlanta) }
+  let(:chicago) { create(:airport, :chicago) }
 
   # 2 direct flights SFO to NYC
   let(:morning_SFO_NYC) { create(:tomorrow_morning_flight, origin_airport: san_fran, destination_airport: new_york) }
@@ -91,7 +91,7 @@
     end
 
     context 'when origin and destination are too close for layover' do
-      let(:los_angeles) { create(:airport, :south_california) }
+      let(:los_angeles) { create(:airport, :los_angeles) }
 
       # 2 direct flights SFO to LAX
       let(:morning_SFO_LAX) { create(:tomorrow_morning_flight, origin_airport: san_fran, destination_airport: los_angeles) }

spec/system/view_flights_spec.rb → spec/system/add_booking_spec.rb

@@ -2,24 +2,20 @@
 
 require "rails_helper"
 
-RSpec.describe "view available flights", type: :system do
-  let(:tomorrow) { Time.zone.tomorrow }
-  let!(:chicago) { create(:airport, location: "Chicago, IL", code: "ORD") }
-  let!(:new_york) { create(:airport, location: "New York City, NY", code: "NYC") }
-  let!(:atlanta) { create(:airport, location: "Atlanta, GA", code: "ATL") }
-  let!(:chicago_to_newyork) do
-    create(:flight, id: 1, origin_airport: chicago, destination_airport: new_york, departure_date: tomorrow)
-  end
-  let!(:chicago_to_atlanta) do
-    create(:flight, id: 2, origin_airport: chicago, destination_airport: atlanta, departure_date: tomorrow)
-  end
+RSpec.describe "add booking", type: :system do
+  let!(:chicago) { create(:airport, :chicago, location: "Chicago, IL") }
+  let!(:new_york) { create(:airport, :new_york_city, location: "New York City, NY") }
+  let!(:atlanta) { create(:airport, :atlanta) }
+
+  let!(:ORD_NYC) { create(:tomorrow_morning_flight, id: 1, origin_airport: chicago, destination_airport: new_york) }
+  let!(:ORD_ATL) { create(:tomorrow_morning_flight, id: 2, origin_airport: chicago, destination_airport: atlanta) }
 
-  it "allows a user to select flight options and create a booking" do
+  it "allows a user to search flights, select a booking option, and create a booking" do
     visit "/"
     select("Chicago, IL", from: "origin_id")
     select("New York City, NY", from: "destination_id")
     select(2, from: "passenger_count")
-    fill_in("departure_date", with: tomorrow)
+    fill_in("departure_date", with: Time.zone.tomorrow)
     click_on("Find Flights")
     within(".flight-results") do
       expect(page).to have_content("Available Flights")