Skip to content

Commit

Permalink
rubocop on all the things
Browse files Browse the repository at this point in the history
  • Loading branch information
sophiedeziel committed Sep 14, 2017
1 parent 5ec980e commit 3721547
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
32 changes: 16 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@ gem "cloudinary"
# Assets
gem "autoprefixer-rails"
gem "bootstrap-sass"
gem "font-awesome-sass"
gem "coffee-rails"
gem "font-awesome-sass"
gem "jquery-rails"
gem "sass-rails"
gem "uglifier"

# Application
gem "rails", "~> 5.1"
gem "devise"
gem "friendly_id"
gem "omniauth-github"
gem "omniauth-twitter"
gem "friendly_id"
gem "devise"
gem "rails", "~> 5.1"

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem "turbolinks"
gem "jquery-turbolinks"
gem "bourbon"
gem "jquery-turbolinks"
gem "turbolinks"

# View
gem "simple_form"
gem "enumerize"
gem "redcarpet"
gem "gemoji"
gem "redcarpet"
gem "simple_form"

# Server
gem "unicorn"
gem "newrelic_rpm", group: :production
gem "unicorn"

# Heroku Assets
gem "rails_12factor", group: :production

# Globalization/Localization
gem "globalize", '~> 5.1.0.beta2'
gem "globalize", "~> 5.1.0.beta2"
gem "globalize-accessors"

# Administration
Expand All @@ -63,9 +63,9 @@ gem "colorize"

group :development do
gem "annotate"
gem "bullet"
gem "spring"
gem "spring-commands-rspec"
gem "bullet"
end

group :legacy do
Expand All @@ -74,27 +74,27 @@ group :legacy do
end

group :development, :test do
gem "byebug"
gem "capybara"
gem "dotenv-rails"
gem "factory_girl_rails"
gem "faker"
gem "guard-ctags-bundler"
gem "guard-rspec", require: false
gem "guard-rubocop"
gem "pry"
gem "byebug"
gem "dotenv-rails"
gem "rspec-rails"
gem "shoulda-matchers"
gem "rspec-its"
gem "rspec-rails"
gem "rubocop", "~> 0.45.0", require: false
gem "shoulda-matchers"
gem "sqlite3"
gem "timecop"
end

group :test do
gem "rails-controller-testing" # this is temporary
gem "vcr"
gem "webmock", ">= 1.8.0"
gem 'rails-controller-testing' #this is temporary
end

gem "coveralls", require: false, group: :test
2 changes: 1 addition & 1 deletion app/models/meetup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def third_tuesday_of(time)

translates :title, :body
globalize_accessors locales: I18n.available_locales, attributes: %i(title introduction conclusion)
#validates_translated :title, :introduction, :conclusion, presence: true
# validates_translated :title, :introduction, :conclusion, presence: true

def self.next
order(starts_at: :asc).find_by("starts_at > ?", Time.now) || NotScheduledYet.new
Expand Down
5 changes: 3 additions & 2 deletions config/boot.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
# frozen_string_literal: true
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)

require 'bundler/setup' # Set up gems listed in the Gemfile.
require "bundler/setup" # Set up gems listed in the Gemfile.
2 changes: 1 addition & 1 deletion spec/controllers/talks_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

describe "POST #create" do
let(:talk) { attributes_for :talk }
subject { post :create, params: { talk: talk } }
subject { post :create, params: { talk: talk } }

it { is_expected.to redirect_to Talk.last }

Expand Down

0 comments on commit 3721547

Please sign in to comment.