Skip to content

Commit

Permalink
Add search form with airport code
Browse files Browse the repository at this point in the history
  • Loading branch information
ToTenMilan committed Sep 12, 2017
1 parent 3b50bc2 commit b0a4f2c
Show file tree
Hide file tree
Showing 23 changed files with 318 additions and 13 deletions.
1 change: 1 addition & 0 deletions rails/milan-flight-booker/.rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
1 change: 1 addition & 0 deletions rails/milan-flight-booker/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'rspec-rails', '~> 3.6'
gem 'factory_girl_rails'
gem 'rspec-collection_matchers'
end

group :development do
Expand Down
3 changes: 3 additions & 0 deletions rails/milan-flight-booker/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ GEM
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
Expand Down Expand Up @@ -198,6 +200,7 @@ DEPENDENCIES
pg (~> 0.18)
puma (~> 3.7)
rails (~> 5.1.4)
rspec-collection_matchers
rspec-rails (~> 3.6)
sass-rails (~> 5.0)
spring
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions rails/milan-flight-booker/app/assets/stylesheets/flights.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the Flights controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
class ApplicationController < ActionController::Base
protect_from_forgery with: :exception

def hello

end
end
17 changes: 17 additions & 0 deletions rails/milan-flight-booker/app/controllers/flights_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
class FlightsController < ApplicationController
def index
@airports = Airport.all
@airport_options = Airport.all.map { |a| [ a.code, a.id ] }
@flights = Flight.all

# @flights = if params[:destination_airport]
# Flight.where('destination_airport.code LIKE ?', "%#{params[:destination_airport]}%")
# else
# Flight.all
# end

# @flights.each do |f|
# f.duration = Time.at(f.duration).utc.strftime("%H:%M:%S")
# end
end
end
2 changes: 2 additions & 0 deletions rails/milan-flight-booker/app/helpers/flights_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module FlightsHelper
end
1 change: 1 addition & 0 deletions rails/milan-flight-booker/app/models/airport.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class Airport < ApplicationRecord
has_many :arriving_flights, class_name: "Flight", foreign_key: "destination_airport_id"
has_many :departing_flights, class_name: "Flight", foreign_key: "departure_airport_id"
# scope by_code order(:code)
end
1 change: 1 addition & 0 deletions rails/milan-flight-booker/app/models/flight.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class Flight < ApplicationRecord
attribute :duration, :duration
belongs_to :destination_airport, class_name: "Airport"
belongs_to :departure_airport, class_name: "Airport"
end

This file was deleted.

37 changes: 37 additions & 0 deletions rails/milan-flight-booker/app/views/flights/index.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<h1>All Flights:</h1>
<ul>
<% @flights.each do |f| %>
<li>Flight Number: <%= f.id %></li>
<li>Flight from: <%= f.departure_airport.code %></li>
<li>Flight to: <%= f.destination_airport.code %></li>
<li>Start date: <%= f.start %></li>
<li>Flight duration: <%= Time.at(f.duration).utc.strftime("%H:%M:%S") %></li>
<hr>
<% end %>

</ul>

<h2>Search flight</h2>
<%= form_for(:flight, method: :get) do %>
<%= select_tag(:flight_id, options_for_select(@airport_options)) %>
<%= submit_tag "Search flight" %>
<% end %>




<!-- as commented out -->
<% if false %>

<%= form_for :flight do |f| %>
<select name="airport_id">
<% @airports.each do |a| %>
<option value="<%= a.id %>"><%= a.code %></option>
<% end %>
</select>


<%= f.select(:airport_id, @airport_options) %>
<% end %>

<% end %>
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

<body>
<div class="jumbotron">
<h1>Hello, world!</h1>
<p>...</p>
<p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
<h1>Milan-flight-booker!</h1>
</div>
<%= yield %>
</body>
Expand Down
5 changes: 3 additions & 2 deletions rails/milan-flight-booker/config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
root 'flights#index'
resources :flights, only: [:index]

root 'application#hello'
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
require 'rails_helper'

RSpec.describe FlightsController, type: :controller do

describe "GET #index" do
before(:each) do
@nyc = FactoryGirl.create :airport, code: "NYC"
@sfa = FactoryGirl.create :airport, code: ""
@flight1 = FactoryGirl.create :flight, destination_airport: @sfa, departure_airport: @nyc
@flight2 = FactoryGirl.create :flight, destination_airport: @nyc, departure_airport: @sfa
# @flights_count = Flight.all.count
get :index
end

# it "returns 2 records from the database" do
# # p response
# expect(flights_response).to eq 2
# end

it "returns http success" do
expect(response).to have_http_status(:success)
end
end

end


# require 'rails_helper'

# RSpec.describe FlightsController, type: :controller do
# describe "GET #index" do
# before(:each) do
# @flights_count = 4.times { FactoryGirl.create :flight }
# get :index
# end



# end
# end
2 changes: 1 addition & 1 deletion rails/milan-flight-booker/spec/factories/flights.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FactoryGirl.define do
factory :flight do
start "2017-09-11 21:36:53"
duration "MyString"
duration "P2D3M"
destination_airport nil
departure_airport nil
end
Expand Down
15 changes: 15 additions & 0 deletions rails/milan-flight-booker/spec/helpers/flights_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

# Specs in this file have access to a helper object that includes
# the FlightsHelper. For example:
#
# describe FlightsHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# expect(helper.concat_strings("this","that")).to eq("this that")
# end
# end
# end
RSpec.describe FlightsHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
end
7 changes: 6 additions & 1 deletion rails/milan-flight-booker/spec/models/airport_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
require 'rails_helper'

RSpec.describe Airport, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
let(:airport) { FactoryGirl.build :airport }
subject { airport }

it { should respond_to :code }
it { should respond_to :arriving_flights }
it { should respond_to :departing_flights }
end
8 changes: 7 additions & 1 deletion rails/milan-flight-booker/spec/models/flight_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
require 'rails_helper'

RSpec.describe Flight, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
let(:flight) { FactoryGirl.build :flight }
subject { flight }

it { should respond_to :start }
it { should respond_to :duration }
it { should respond_to :destination_airport_id }
it { should respond_to :departure_airport_id }
end
67 changes: 67 additions & 0 deletions rails/milan-flight-booker/spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
require 'spec_helper'
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
# Prevent database truncation if the environment is production
abort("The Rails environment is running in production mode!") if Rails.env.production?
require 'rspec/rails'
# Add additional requires below this line. Rails is not loaded until this point!

# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
# run as spec files by default. This means that files in spec/support that end
# in _spec.rb will both be required and run as specs, causing the specs to be
# run twice. It is recommended that you do not name files matching this glob to
# end with _spec.rb. You can configure this pattern with the --pattern
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.

# The following line is provided for convenience purposes. It has the downside
# of increasing the boot-up time by auto-requiring all files in the support
# directory. Alternatively, in the individual `*_spec.rb` files, manually
# require only the support files necessary.
#
# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }

# Checks for pending migration and applies them before tests are run.
# If you are not using ActiveRecord, you can remove this line.
ActiveRecord::Migration.maintain_test_schema!

RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"

# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
config.use_transactional_fixtures = true

# RSpec Rails can automatically mix in different behaviours to your tests
# based on their file location, for example enabling you to call `get` and
# `post` in specs under `spec/controllers`.
#
# You can disable this behaviour by removing the line below, and instead
# explicitly tag your specs with their type, e.g.:
#
# RSpec.describe UsersController, :type => :controller do
# # ...
# end
#
# The different available types are documented in the features, such as in
# https://relishapp.com/rspec/rspec-rails/docs
config.infer_spec_type_from_file_location!

# Filter lines from Rails gems in backtraces.
config.filter_rails_from_backtrace!
# arbitrary gems may also be filtered via:
# config.filter_gems_from_backtrace("gem name")

# spec/support/request_helpers.rb
# config.include Request::JsonHelpers, type: :controller

config.around(:each) do |example|
ActiveRecord::Base.transaction do
example.run
raise ActiveRecord::Rollback
end
end
end
97 changes: 97 additions & 0 deletions rails/milan-flight-booker/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
require 'rspec/collection_matchers'
# This file was generated by the `rails generate rspec:install` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
# The generated `.rspec` file contains `--require spec_helper` which will cause
# this file to always be loaded, without a need to explicitly require it in any
# files.
#
# Given that it is always loaded, you are encouraged to keep this file as
# light-weight as possible. Requiring heavyweight dependencies from this file
# will add to the boot time of your test suite on EVERY test run, even for an
# individual file that may not need all of that loaded. Instead, consider making
# a separate helper file that requires the additional dependencies and performs
# the additional setup, and require it from the spec files that actually need
# it.
#
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
# assertions if you prefer.
config.expect_with :rspec do |expectations|
# This option will default to `true` in RSpec 4. It makes the `description`
# and `failure_message` of custom matchers include text for helper methods
# defined using `chain`, e.g.:
# be_bigger_than(2).and_smaller_than(4).description
# # => "be bigger than 2 and smaller than 4"
# ...rather than:
# # => "be bigger than 2"
expectations.include_chain_clauses_in_custom_matcher_descriptions = true
end

# rspec-mocks config goes here. You can use an alternate test double
# library (such as bogus or mocha) by changing the `mock_with` option here.
config.mock_with :rspec do |mocks|
# Prevents you from mocking or stubbing a method that does not exist on
# a real object. This is generally recommended, and will default to
# `true` in RSpec 4.
mocks.verify_partial_doubles = true
end

# This option will default to `:apply_to_host_groups` in RSpec 4 (and will
# have no way to turn it off -- the option exists only for backwards
# compatibility in RSpec 3). It causes shared context metadata to be
# inherited by the metadata hash of host groups and examples, rather than
# triggering implicit auto-inclusion in groups with matching metadata.
config.shared_context_metadata_behavior = :apply_to_host_groups

# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
=begin
# This allows you to limit a spec run to individual examples or groups
# you care about by tagging them with `:focus` metadata. When nothing
# is tagged with `:focus`, all examples get run. RSpec also provides
# aliases for `it`, `describe`, and `context` that include `:focus`
# metadata: `fit`, `fdescribe` and `fcontext`, respectively.
config.filter_run_when_matching :focus
# Allows RSpec to persist some state between runs in order to support
# the `--only-failures` and `--next-failure` CLI options. We recommend
# you configure your source control system to ignore this file.
config.example_status_persistence_file_path = "spec/examples.txt"
# Limits the available syntax to the non-monkey patched syntax that is
# recommended. For more details, see:
# - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
# - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
# - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
config.disable_monkey_patching!
# Many RSpec users commonly either run the entire suite or an individual
# file, and it's useful to allow more verbose output when running an
# individual spec file.
if config.files_to_run.one?
# Use the documentation formatter for detailed output,
# unless a formatter has already been configured
# (e.g. via a command-line flag).
config.default_formatter = "doc"
end
# Print the 10 slowest examples and example groups at the
# end of the spec run, to help surface which specs are running
# particularly slow.
config.profile_examples = 10
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = :random
# Seed global randomization in this process using the `--seed` CLI option.
# Setting this allows you to use `--seed` to deterministically reproduce
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
=end
end
Loading

0 comments on commit b0a4f2c

Please sign in to comment.