Merge branch 'master' of https://github.com/r-spacex/SpaceX-API

Author: jakewmeyer

app.rb

@@ -4,6 +4,7 @@
 # launch data.
 #
 
+require 'bundler/setup'
 require 'sinatra'
 require 'sinatra/subdomain'
 require 'json'
@@ -16,6 +17,10 @@
 require './data/launchpads.rb'
 require './data/dragon.rb'
 
+# Uses the modular version of Sinatra
+class SpacexAPI < Sinatra::Base
+  register Sinatra::Subdomain
+
 # DB connection to MariaDB
 DB = Mysql2::Client.new(
   :host => ENV['MARIA_HOST'],
@@ -275,3 +280,4 @@ def hash_merge(*hashes)
     end
 end
 end
+end

config.ru

@@ -5,4 +5,4 @@ require './app'
 
 Bundler.require
 
-run Sinatra::Application
+run SpacexAPI

test/test.rb

@@ -1,27 +1,41 @@
-require "./app.rb"
 require "test/unit"
 require "rack/test"
+require_relative '../app'
+require 'json'
+
+module Rack
+  module Test
+    DEFAULT_HOST = "api.example.org"
+  end
+end
 
 class AppTest < Test::Unit::TestCase
   include Rack::Test::Methods
 
   def app
-    Sinatra::Application
+    @app = SpacexAPI
   end
 
   def test_response_is_ok
     get "/"
+    assert last_response.ok?
   end
-
-  def test_response_is_ok_for_vehicles
-    get "/vehicles"
+  
+  def test_info_response
+    get "/info"
+    assert last_response.ok?
+	data = JSON.parse(last_response.body)
+    #test out some data that is unlikely to ever change
+    assert data["name"] == "SpaceX"
   end
+  
+  def test_launchpads_response
+    get "/launchpads"
+    assert last_response.ok?
+    data = JSON.parse(last_response.body)
+    #make sure we got at least one launchpad back
+    assert data["launchpads"].count > 0
+  end	
 
-  def test_response_is_ok_for_launches_up
-    get "/launches/upcoming"
-  end
-
-  def test_response_is_ok_for_launchpads
-    get '/launchpads'
-  end
+	
 end