From 775418918782d5284000ed0bfea364458c748567 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 10 Aug 2012 18:07:50 -0400 Subject: Fully embrace Ruby 1.9 hash syntax Didn't bother with files in db/, config/, or features/ --- spec/models/activity_observer_spec.rb | 8 ++++---- spec/models/event_spec.rb | 30 +++++++++++++++--------------- spec/models/issue_observer_spec.rb | 16 ++++++++-------- spec/models/issue_spec.rb | 32 ++++++++++++++++---------------- spec/models/merge_request_spec.rb | 16 ++++++++-------- spec/models/milestone_spec.rb | 8 ++++---- spec/models/note_spec.rb | 34 +++++++++++++++++----------------- spec/models/project_hooks_spec.rb | 2 +- spec/models/project_security_spec.rb | 8 ++++---- spec/models/project_spec.rb | 20 ++++++++++---------- spec/models/protected_branch_spec.rb | 4 ++-- spec/models/system_hook_spec.rb | 2 +- spec/models/user_spec.rb | 14 +++++++------- 13 files changed, 97 insertions(+), 97 deletions(-) (limited to 'spec/models') diff --git a/spec/models/activity_observer_spec.rb b/spec/models/activity_observer_spec.rb index aed1b26d306..0db4a9985be 100644 --- a/spec/models/activity_observer_spec.rb +++ b/spec/models/activity_observer_spec.rb @@ -11,7 +11,7 @@ describe ActivityObserver do describe "Merge Request created" do before do MergeRequest.observers.enable :activity_observer do - @merge_request = Factory :merge_request, :project => project + @merge_request = Factory :merge_request, project: project @event = Event.last end end @@ -24,7 +24,7 @@ describe ActivityObserver do describe "Issue created" do before do Issue.observers.enable :activity_observer do - @issue = Factory :issue, :project => project + @issue = Factory :issue, project: project @event = Event.last end end @@ -36,8 +36,8 @@ describe ActivityObserver do #describe "Issue commented" do #before do - #@issue = Factory :issue, :project => project - #@note = Factory :note, :noteable => @issue, :project => project + #@issue = Factory :issue, project: project + #@note = Factory :note, noteable: @issue, project: project #@event = Event.last #end diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index a295e2860cc..188f09978a7 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -45,25 +45,25 @@ describe Event do @user = project.owner data = { - :before => "0000000000000000000000000000000000000000", - :after => "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", - :ref => "refs/heads/master", - :user_id => @user.id, - :user_name => @user.name, - :repository => { - :name => project.name, - :url => "localhost/rubinius", - :description => "", - :homepage => "localhost/rubinius", - :private => true + before: "0000000000000000000000000000000000000000", + after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", + ref: "refs/heads/master", + user_id: @user.id, + user_name: @user.name, + repository: { + name: project.name, + url: "localhost/rubinius", + description: "", + homepage: "localhost/rubinius", + private: true } } @event = Event.create( - :project => project, - :action => Event::Pushed, - :data => data, - :author_id => @user.id + project: project, + action: Event::Pushed, + data: data, + author_id: @user.id ) end diff --git a/spec/models/issue_observer_spec.rb b/spec/models/issue_observer_spec.rb index 2b9798f7e53..c6a405f1c1b 100644 --- a/spec/models/issue_observer_spec.rb +++ b/spec/models/issue_observer_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' describe IssueObserver do - let(:some_user) { double(:user, :id => 1) } - let(:assignee) { double(:user, :id => 2) } - let(:issue) { double(:issue, :id => 42, :assignee => assignee) } + let(:some_user) { double(:user, id: 1) } + let(:assignee) { double(:user, id: 2) } + let(:issue) { double(:issue, id: 42, assignee: assignee) } before(:each) { subject.stub(:current_user).and_return(some_user) } @@ -15,13 +15,13 @@ describe IssueObserver do subject.should_receive(:after_create) Issue.observers.enable :issue_observer do - Factory.create(:issue, :project => Factory.create(:project)) + Factory.create(:issue, project: Factory.create(:project)) end end it 'sends an email to the assignee' do Notify.should_receive(:new_issue_email).with(issue.id). - and_return(double(:deliver => true)) + and_return(double(deliver: true)) subject.after_create(issue) end @@ -42,7 +42,7 @@ describe IssueObserver do end it 'is called when an issue is changed' do - changed = Factory.create(:issue, :project => Factory.create(:project)) + changed = Factory.create(:issue, project: Factory.create(:project)) subject.should_receive(:after_update) Issue.observers.enable :issue_observer do @@ -101,7 +101,7 @@ describe IssueObserver do end describe '#send_reassigned_email' do - let(:previous_assignee) { double(:user, :id => 3) } + let(:previous_assignee) { double(:user, id: 3) } before(:each) do issue.stub(:assignee_id).and_return(assignee.id) @@ -110,7 +110,7 @@ describe IssueObserver do def it_sends_a_reassigned_email_to(recipient) Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id). - and_return(double(:deliver => true)) + and_return(double(deliver: true)) end def it_does_not_send_a_reassigned_email_to(recipient) diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 806b8ee74e0..e9cbd72589a 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -20,9 +20,9 @@ describe Issue do end subject { Factory.create(:issue, - :author => Factory(:user), - :assignee => Factory(:user), - :project => Factory.create(:project)) } + author: Factory(:user), + assignee: Factory(:user), + project: Factory.create(:project)) } it { should be_valid } describe '#is_being_reassigned?' do @@ -42,10 +42,10 @@ describe Issue do end it 'returns false if the closed attribute has changed and is now false' do issue = Factory.create(:issue, - :closed => true, - :author => Factory(:user), - :assignee => Factory(:user), - :project => Factory.create(:project)) + closed: true, + author: Factory(:user), + assignee: Factory(:user), + project: Factory.create(:project)) issue.closed = false issue.is_being_closed?.should be_false end @@ -58,10 +58,10 @@ describe Issue do describe '#is_being_reopened?' do it 'returns true if the closed attribute has changed and is now false' do issue = Factory.create(:issue, - :closed => true, - :author => Factory(:user), - :assignee => Factory(:user), - :project => Factory.create(:project)) + closed: true, + author: Factory(:user), + assignee: Factory(:user), + project: Factory.create(:project)) issue.closed = false issue.is_being_reopened?.should be_true end @@ -78,9 +78,9 @@ describe Issue do let(:project) { Factory(:project) } subject { Factory.create(:issue, - :author => Factory(:user), - :assignee => Factory(:user), - :project => project) + author: Factory(:user), + assignee: Factory(:user), + project: project) } it "with no notes has a 0/0 score" do @@ -107,8 +107,8 @@ describe Issue do end describe ".search" do - let!(:issue) { Factory.create(:issue, :title => "Searchable issue", - :project => Factory.create(:project)) } + let!(:issue) { Factory.create(:issue, title: "Searchable issue", + project: Factory.create(:project)) } it "matches by title" do Issue.search('able').all.should == [issue] diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 4ef6becf41b..c7ad08a1e06 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -21,17 +21,17 @@ describe MergeRequest do end it { Factory.create(:merge_request, - :author => Factory(:user), - :assignee => Factory(:user), - :project => Factory.create(:project)).should be_valid } + author: Factory(:user), + assignee: Factory(:user), + project: Factory.create(:project)).should be_valid } describe "plus 1" do let(:project) { Factory(:project) } subject { Factory.create(:merge_request, - :author => Factory(:user), - :assignee => Factory(:user), - :project => project) + author: Factory(:user), + assignee: Factory(:user), + project: project) } it "with no notes has a 0/0 score" do @@ -58,8 +58,8 @@ describe MergeRequest do end describe ".search" do - let!(:issue) { Factory.create(:issue, :title => "Searchable issue", - :project => Factory.create(:project)) } + let!(:issue) { Factory.create(:issue, title: "Searchable issue", + project: Factory.create(:project)) } it "matches by title" do Issue.search('able').all.should == [issue] diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb index bb71ca990f0..880d3f307a3 100644 --- a/spec/models/milestone_spec.rb +++ b/spec/models/milestone_spec.rb @@ -26,8 +26,8 @@ describe Milestone do end let(:project) { Factory :project } - let(:milestone) { Factory :milestone, :project => project } - let(:issue) { Factory :issue, :project => project } + let(:milestone) { Factory :milestone, project: project } + let(:issue) { Factory :issue, project: project } it { milestone.should be_valid } @@ -39,14 +39,14 @@ describe Milestone do it { milestone.percent_complete.should == 0 } it do - issue.update_attributes :closed => true + issue.update_attributes closed: true milestone.percent_complete.should == 100 end end describe :expires_at do before do - milestone.update_attributes :due_date => Date.today + 1.day + milestone.update_attributes due_date: Date.today + 1.day end it { milestone.expires_at.should_not be_nil } diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index f2dfcabcc87..c97b23cb4fa 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -14,7 +14,7 @@ describe Note do end it { Factory.create(:note, - :project => project).should be_valid } + project: project).should be_valid } describe "Scopes" do it "should have a today named scope that returns ..." do Note.today.where_values.should == ["created_at >= '#{Date.today}'"] @@ -44,9 +44,9 @@ describe Note do before do @note = Factory :note, - :project => project, - :noteable_id => commit.id, - :noteable_type => "Commit" + project: project, + noteable_id: commit.id, + noteable_type: "Commit" end it "should save a valid note" do @@ -58,10 +58,10 @@ describe Note do describe "Pre-line commit notes" do before do @note = Factory :note, - :project => project, - :noteable_id => commit.id, - :noteable_type => "Commit", - :line_code => "0_16_1" + project: project, + noteable_id: commit.id, + noteable_type: "Commit", + line_code: "0_16_1" end it "should save a valid note" do @@ -72,7 +72,7 @@ describe Note do describe '#create_status_change_note' do let(:project) { Factory.create(:project) } - let(:thing) { Factory.create(:issue, :project => project) } + let(:thing) { Factory.create(:issue, project: project) } let(:author) { Factory(:user) } let(:status) { 'new_status' } @@ -92,7 +92,7 @@ describe Note do describe :authorization do before do @p1 = project - @p2 = Factory :project, :code => "alien", :path => "gitlabhq_1" + @p2 = Factory :project, code: "alien", path: "gitlabhq_1" @u1 = Factory :user @u2 = Factory :user @u3 = Factory :user @@ -102,8 +102,8 @@ describe Note do describe :read do before do - @p1.users_projects.create(:user => @u2, :project_access => UsersProject::GUEST) - @p2.users_projects.create(:user => @u3, :project_access => UsersProject::GUEST) + @p1.users_projects.create(user: @u2, project_access: UsersProject::GUEST) + @p2.users_projects.create(user: @u3, project_access: UsersProject::GUEST) end it { @abilities.allowed?(@u1, :read_note, @p1).should be_false } @@ -113,8 +113,8 @@ describe Note do describe :write do before do - @p1.users_projects.create(:user => @u2, :project_access => UsersProject::DEVELOPER) - @p2.users_projects.create(:user => @u3, :project_access => UsersProject::DEVELOPER) + @p1.users_projects.create(user: @u2, project_access: UsersProject::DEVELOPER) + @p2.users_projects.create(user: @u3, project_access: UsersProject::DEVELOPER) end it { @abilities.allowed?(@u1, :write_note, @p1).should be_false } @@ -124,9 +124,9 @@ describe Note do describe :admin do before do - @p1.users_projects.create(:user => @u1, :project_access => UsersProject::REPORTER) - @p1.users_projects.create(:user => @u2, :project_access => UsersProject::MASTER) - @p2.users_projects.create(:user => @u3, :project_access => UsersProject::MASTER) + @p1.users_projects.create(user: @u1, project_access: UsersProject::REPORTER) + @p1.users_projects.create(user: @u2, project_access: UsersProject::MASTER) + @p2.users_projects.create(user: @u3, project_access: UsersProject::MASTER) end it { @abilities.allowed?(@u1, :admin_note, @p1).should be_false } diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb index 5544c5a8683..129e3d61030 100644 --- a/spec/models/project_hooks_spec.rb +++ b/spec/models/project_hooks_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Project, "Hooks" do let(:project) { Factory :project } before do - @key = Factory :key, :user => project.owner + @key = Factory :key, user: project.owner @user = @key.user @key_id = @key.identifier end diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb index bd697af9652..baf6d4b68ea 100644 --- a/spec/models/project_security_spec.rb +++ b/spec/models/project_security_spec.rb @@ -12,7 +12,7 @@ describe Project do describe "read access" do before do - @p1.users_projects.create(:project => @p1, :user => @u2, :project_access => UsersProject::REPORTER) + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::REPORTER) end it { @abilities.allowed?(@u1, :read_project, @p1).should be_false } @@ -21,7 +21,7 @@ describe Project do describe "write access" do before do - @p1.users_projects.create(:project => @p1, :user => @u2, :project_access => UsersProject::DEVELOPER) + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::DEVELOPER) end it { @abilities.allowed?(@u1, :write_project, @p1).should be_false } @@ -30,8 +30,8 @@ describe Project do describe "admin access" do before do - @p1.users_projects.create(:project => @p1, :user => @u1, :project_access => UsersProject::DEVELOPER) - @p1.users_projects.create(:project => @p1, :user => @u2, :project_access => UsersProject::MASTER) + @p1.users_projects.create(project: @p1, user: @u1, project_access: UsersProject::DEVELOPER) + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::MASTER) end it { @abilities.allowed?(@u1, :admin_project, @p1).should be_false } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 2c8ddd5c718..5bba4ff6c96 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -80,17 +80,17 @@ describe Project do end it "should return valid url to repo" do - project = Project.new(:path => "somewhere") + project = Project.new(path: "somewhere") project.url_to_repo.should == Gitlab.config.ssh_path + "somewhere.git" end it "should return path to repo" do - project = Project.new(:path => "somewhere") + project = Project.new(path: "somewhere") project.path_to_repo.should == File.join(Rails.root, "tmp", "tests", "somewhere") end it "returns the full web URL for this repo" do - project = Project.new(:code => "somewhere") + project = Project.new(code: "somewhere") project.web_url.should == "#{Gitlab.config.url}/somewhere" end @@ -101,7 +101,7 @@ describe Project do end it "should be invalid repo" do - project = Project.new(:name => "ok_name", :path => "/INVALID_PATH/", :code => "NEOK") + project = Project.new(name: "ok_name", path: "/INVALID_PATH/", code: "NEOK") project.valid_repo?.should be_false end end @@ -121,7 +121,7 @@ describe Project do let(:project) { Factory :project } it 'returns the creation date of the project\'s last event if present' do - last_event = double(:created_at => 'now') + last_event = double(created_at: 'now') project.stub(:events).and_return( [double, double, last_event] ) project.last_activity_date.should == last_event.created_at end @@ -161,7 +161,7 @@ describe Project do end it "should return nil" do - lambda { Project.new(:path => "invalid").repo }.should raise_error(Grit::NoSuchPathError) + lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError) end it "should return nil" do @@ -214,10 +214,10 @@ describe Project do before do @merge_request = Factory :merge_request, - :project => project, - :merged => false, - :closed => false - @key = Factory :key, :user_id => project.owner.id + project: project, + merged: false, + closed: false + @key = Factory :key, user_id: project.owner.id end it "should close merge request if last commit from source branch was pushed to target branch" do diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb index 6724fb8db1b..1654e3b6f56 100644 --- a/spec/models/protected_branch_spec.rb +++ b/spec/models/protected_branch_spec.rb @@ -24,7 +24,7 @@ describe ProtectedBranch do end describe 'Callbacks' do - subject { ProtectedBranch.new(:project => project, :name => 'branch_name') } + subject { ProtectedBranch.new(project: project, name: 'branch_name') } it 'call update_repository after save' do subject.should_receive(:update_repository) @@ -38,7 +38,7 @@ describe ProtectedBranch do end describe '#commit' do - subject { ProtectedBranch.new(:project => project, :name => 'cant_touch_this') } + subject { ProtectedBranch.new(project: project, name: 'cant_touch_this') } it 'commits itself to its project' do project.should_receive(:commit).with('cant_touch_this') diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb index 4ad4d1681fc..56d76ed08cf 100644 --- a/spec/models/system_hook_spec.rb +++ b/spec/models/system_hook_spec.rb @@ -12,7 +12,7 @@ describe SystemHook do it "project_create hook" do user = Factory :user with_resque do - project = Factory :project_without_owner, :owner => user + project = Factory :project_without_owner, owner: user end WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 89e0f96f51c..265dcef1e77 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -18,29 +18,29 @@ describe User do end it "should return valid identifier" do - user = User.new(:email => "test@mail.com") + user = User.new(email: "test@mail.com") user.identifier.should == "test_mail_com" end it "should return identifier without + sign" do - user = User.new(:email => "test+foo@mail.com") + user = User.new(email: "test+foo@mail.com") user.identifier.should == "test_foo_mail_com" end it "should execute callback when force_random_password specified" do - user = User.new(:email => "test@mail.com", :force_random_password => true) + user = User.new(email: "test@mail.com", force_random_password: true) user.should_receive(:generate_password) user.save end it "should not generate password by default" do - user = Factory(:user, :password => 'abcdefg', :password_confirmation => 'abcdefg') + user = Factory(:user, password: 'abcdefg', password_confirmation: 'abcdefg') user.password.should == 'abcdefg' end it "should generate password when forcing random password" do Devise.stub(:friendly_token).and_return('123456789') - user = User.create(:email => "test1@mail.com", :force_random_password => true) + user = User.create(email: "test1@mail.com", force_random_password: true) user.password.should == user.password_confirmation user.password.should == '12345678' end @@ -54,8 +54,8 @@ describe User do before do @user = Factory :user @note = Factory :note, - :author => @user, - :project => Factory(:project) + author: @user, + project: Factory(:project) end it "should destroy all notes with user" do -- cgit v1.2.3