fix merge conflicts

src/model/database/db_connect.js

@@ -4,7 +4,7 @@ require('env2')('./config.env');
 
 const DB_URL =
   process.env.ENV === 'test'
-    ? process.env.DB_TEST_URL
+    ? process.env.TEST_DB_URL
     : process.env.DB_URL;
 
 if (!DB_URL) {

src/model/queries/getQueries.js

@@ -4,6 +4,7 @@ const dbConnect = require('../database/db_connect.js');
 const getUserData = username => dbConnect.query('SELECT password FROM users WHERE username=$1', [username])
   .then(res => res[0]);
 
+
 // get all user symptoms from symptoms table
 const getSymptoms = username => dbConnect.query('select symptom from symptoms where user_id = (select id from users where username=$1)', [username]);
 // get all user factors from factor table

src/tests/queries.test.js

@@ -32,7 +32,7 @@ test('testing that getUserData returns an object with user password', (t) => {
 // test query to get a symptom from symptoms table
 test('testing symptoms query returns something', (t) => {
   runDbBuild()
-    .then(() => getSymptoms(1))
+    .then(() => getSymptoms('eade'))
     .then((queryResult) => {
       t.ok(queryResult);
       t.end();
@@ -48,7 +48,7 @@ test('testing symptoms query returns something', (t) => {
 // test query to get a factor from factors table
 test('testing factors query returns something', (t) => {
   runDbBuild()
-    .then(() => getFactors(1))
+    .then(() => getFactors('eade'))
     .then((queryResult) => {
       t.ok(queryResult);
       t.end();