remove simplecov and fix is_admin?

seuros · seuros · commit 6252ea4527f8 · 2015-07-04T22:58:28.000Z
diff --git a/Gemfile b/Gemfile
@@ -165,7 +165,6 @@ source 'https://rubygems.org' do
     gem 'database_cleaner'
     gem 'fuubar'
     gem 'shoulda-matchers'
-    gem 'simplecov'
     gem 'timecop'
     gem 'vcr'
     gem 'webmock', '<1.16'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -817,7 +817,6 @@ DEPENDENCIES
   shoulda-matchers!
   sidekiq!
   simple_form!
-  simplecov!
   sinatra!
   sitemap_generator!
   slim-rails!
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -199,7 +199,7 @@ def require_admin!
   end
 
   def is_admin?
-    signed_in? && current_user.admin?
+    signed_in? && current_user.role == 'admin'
   end
 
   def iphone_user_agent?
