Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules

[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'

spec/features/user_spec.rb

@@ -5,7 +5,8 @@ feature User do
   let!(:participant_role) { create(:participant_role) }
   let!(:admin_role) { create(:admin_role) }
   let(:admin) { create(:admin) }
-  shared_examples 'admin ability' do |user|
+
+  shared_examples 'admin ability' do
     scenario 'deletes a user', feature: true, js: true do
       sign_in(admin)
       visit admin_users_path
@@ -34,6 +35,7 @@ feature User do
       sign_out
     end
   end
+
   describe 'admin' do
     it_behaves_like 'admin ability', :admin
   end

spec/features/volunteers_spec.rb

@@ -8,7 +8,7 @@ feature Conference do
   let(:admin) { create(:admin) }
   let(:conference) { create(:conference) }
 
-  shared_examples 'volunteer' do |user|
+  shared_examples 'volunteer' do
     scenario 'adds and updates vdays', feature: true, js: true do
       sign_in(admin)
       visit admin_conference_volunteers_info_path(

spec/models/conference_spec.rb

@@ -406,7 +406,7 @@ describe Conference do
   end
 
   describe '#difficulty_levels' do
-    before (:each) do
+    before do
       subject.email_settings = create(:email_settings)
       @easy = create(:difficulty_level, title: 'Easy', color: '#000000')
       @hard = create(:difficulty_level, title: 'Hard', color: '#ffffff')
@@ -503,7 +503,7 @@ describe Conference do
   end
 
   describe 'event type distribution' do
-    before (:each) do
+    before do
       subject.email_settings = create(:email_settings)
       @workshop = create(:event_type, title: 'Workshop', color: '#000000')
       @lecture = create(:event_type, title: 'Lecture', color: '#ffffff')
@@ -599,7 +599,7 @@ describe Conference do
   end
 
   describe 'tracks_distribution' do
-    before (:each) do
+    before do
       subject.email_settings = create(:email_settings)
       @track_one = create(:track, name: 'Track One', color: '#000000')
       @track_two = create(:track, name: 'Track Two', color: '#ffffff')

spec/support/database_cleaner.rb

@@ -7,7 +7,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
   
-  config.before(:each, :js => true) do
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :truncation
   end
 

spec/support/login_macros.rb

@@ -1,14 +1,12 @@
 module LoginMacros
-
   include Warden::Test::Helpers
   Warden.test_mode!
 
   def sign_in(user)
-    login_as(user, :scope => :user)
+    login_as(user, scope: :user)
   end
 
   def sign_out
     logout(:user)
   end
-
 end

spec/views/home/index.html.haml_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'home/index' do
-   it "renders _conference partial for each conference" do
+  it "renders _conference partial for each conference" do
     allow(view).to receive(:date_string).and_return("January 17 - 21 2014")
     assign(:current, [create(:conference), create(:conference)])
     render
-    expect(view).to render_template(:partial => "_conference_details", :count => 2)
+    expect(view).to render_template(partial: "_conference_details", count: 2)
   end
 end