Merge pull request #7 from dougcole/add_tests

adding tests!
opengovernment · Apr 6, 2018 · 72bc84f · 72bc84f
2 parents c1548c3 + bc2af67
commit 72bc84f
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 103 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: ruby
+services:
+  - postgresql
+before_script:
+  - psql -c "CREATE USER askthem SUPERUSER;" -U postgres
+  - psql -c 'create database "askthem-test";' -U askthem -d postgres
+  - bin/rails db:migrate RAILS_ENV=test
+
diff --git a/config/database.yml b/config/database.yml
@@ -17,4 +17,4 @@ test:
 
 production:
   <<: *default
-  database: askthem-test
+  database: askthem-production
diff --git a/config/routes.rb b/config/routes.rb
@@ -4,5 +4,5 @@
 
   resources :questions, :only => [:index, :new, :create]
   resources :votes, :only => :create
-  get 'search', to: 'search#index'
+  get 'search', to: 'search#index', as: :search
 end
diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
@@ -1,7 +1,11 @@
 require 'test_helper'
 
 class SearchControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
+  test "returns results from database" do
+    get search_url, params: {q: 'Washington'}
+    result = JSON.parse(response.body)
+    assert_equal result['results'].size, 1
+    assert_equal result['results'].first['text'],
+      "U.S. Representative - Washington's 4th congressional district"
+  end
 end
diff --git a/test/fixtures/contests.yml b/test/fixtures/contests.yml
@@ -4,8 +4,7 @@
 # model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
-one: {}
-# column: value
-#
-two: {}
-# column: value
+one:
+  name: U.S. Representative
+  electoral_district_name: Washington's 4th congressional district
+  electoral_district_type: congressional
diff --git a/test/fixtures/questions.yml b/test/fixtures/questions.yml
diff --git a/test/fixtures/techandciviclife/candidate_contests.yml b/test/fixtures/techandciviclife/candidate_contests.yml
diff --git a/test/fixtures/techandciviclife/candidate_selections.yml b/test/fixtures/techandciviclife/candidate_selections.yml
diff --git a/test/fixtures/techandciviclife/candidates.yml b/test/fixtures/techandciviclife/candidates.yml
diff --git a/test/fixtures/techandciviclife/electoral_districts.yml b/test/fixtures/techandciviclife/electoral_districts.yml
diff --git a/test/fixtures/techandciviclife/offices.yml b/test/fixtures/techandciviclife/offices.yml
diff --git a/test/fixtures/techandciviclife/parties.yml b/test/fixtures/techandciviclife/parties.yml
diff --git a/test/fixtures/techandciviclife/people.yml b/test/fixtures/techandciviclife/people.yml
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
@@ -4,8 +4,5 @@
 # model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
-one: {}
-# column: value
-#
-two: {}
-# column: value
+one:
+  email: [email protected]