Merge pull request #1297 from siddhantbajaj/Travis_Errors

fixed travis error

spec/support/database_cleaner.rb

@@ -1,6 +1,16 @@
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
     Rails.application.load_seed
   end
+
+  config.before(:each) do |example|
+    DatabaseCleaner.strategy = (example.metadata[:js] == true) ? :truncation : :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do |example|
+    DatabaseCleaner.clean
+    Rails.application.load_seed if example.metadata[:js] == true
+  end
 end

spec/support/factory_girl.rb

@@ -1,12 +0,0 @@
-require_relative 'external_request'
-
-RSpec.configure do |config|
-
-  config.before(:suite) do
-    if ENV['OSEM_FACTORY_LINT'] != 'false'
-      mock_commercial_request
-      FactoryGirl.lint
-    end
-  end
-
-end