diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-06-22 14:41:00 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-22 14:41:00 -0400 |
commit | 94eff655693a504b8b5d10472257709d8a2b342b (patch) | |
tree | 6ac43313772ee1c1933ed5b5fa3eb59ec6d14f13 /spec/models | |
parent | 56246b70fb4fcbbb6f623ba9a38ba428a85175ef (diff) | |
download | gitlab-ce-94eff655693a504b8b5d10472257709d8a2b342b.tar.gz |
Fix Style/SpaceInsideHashLiteralBraces cop violations
These fixes were performed automatically by Rubocop's `-a` flag.
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/commit_range_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/hooks/service_hook_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/hooks/system_hook_spec.rb | 20 | ||||
-rw-r--r-- | spec/models/hooks/web_hook_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/project_services/hipchat_service_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/project_wiki_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/wiki_page_spec.rb | 8 |
8 files changed, 27 insertions, 27 deletions
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb index e7fb43ff335..5e7efadde28 100644 --- a/spec/models/commit_range_spec.rb +++ b/spec/models/commit_range_spec.rb @@ -60,11 +60,11 @@ describe CommitRange do end it 'includes the correct values for a three-dot range' do - expect(range.to_param).to eq({from: sha_from, to: sha_to}) + expect(range.to_param).to eq({ from: sha_from, to: sha_to }) end it 'includes the correct values for a two-dot range' do - expect(range2.to_param).to eq({from: sha_from + '^', to: sha_to}) + expect(range2.to_param).to eq({ from: sha_from + '^', to: sha_to }) end end diff --git a/spec/models/hooks/service_hook_spec.rb b/spec/models/hooks/service_hook_spec.rb index fb5111dd9f5..f7da4f43680 100644 --- a/spec/models/hooks/service_hook_spec.rb +++ b/spec/models/hooks/service_hook_spec.rb @@ -26,7 +26,7 @@ describe ServiceHook do describe "execute" do before(:each) do @service_hook = create(:service_hook) - @data = { project_id: 1, data: {}} + @data = { project_id: 1, data: {} } WebMock.stub_request(:post, @service_hook.url) end @@ -34,7 +34,7 @@ describe ServiceHook do it "POSTs to the web hook URL" do @service_hook.execute(@data) expect(WebMock).to have_requested(:post, @service_hook.url).with( - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook' } ).once end @@ -43,7 +43,7 @@ describe ServiceHook do @service_hook.execute(@data) expect(WebMock).to have_requested(:post, @service_hook.url).with( - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook' } ).once end diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb index edb21fc2e47..4175f9dd88f 100644 --- a/spec/models/hooks/system_hook_spec.rb +++ b/spec/models/hooks/system_hook_spec.rb @@ -29,7 +29,7 @@ describe SystemHook do Projects::CreateService.new(create(:user), name: 'empty').execute expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /project_create/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -39,7 +39,7 @@ describe SystemHook do Projects::DestroyService.new(project, user, {}).execute expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /project_destroy/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -47,7 +47,7 @@ describe SystemHook do create(:user) expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_create/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -56,7 +56,7 @@ describe SystemHook do user.destroy expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_destroy/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -66,7 +66,7 @@ describe SystemHook do project.team << [user, :master] expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_add_to_team/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -77,7 +77,7 @@ describe SystemHook do project.project_members.destroy_all expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_remove_from_team/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -85,7 +85,7 @@ describe SystemHook do create(:group) expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /group_create/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -94,7 +94,7 @@ describe SystemHook do group.destroy expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /group_destroy/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -104,7 +104,7 @@ describe SystemHook do group.add_user(user, Gitlab::Access::MASTER) expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_add_to_group/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end @@ -115,7 +115,7 @@ describe SystemHook do group.group_members.destroy_all expect(WebMock).to have_requested(:post, @system_hook.url).with( body: /user_remove_from_group/, - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' } ).once end diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb index 4c3f0cbcbbf..70151ba2331 100644 --- a/spec/models/hooks/web_hook_spec.rb +++ b/spec/models/hooks/web_hook_spec.rb @@ -47,7 +47,7 @@ describe ProjectHook do @project_hook = create(:project_hook) @project = create(:project) @project.hooks << [@project_hook] - @data = { before: 'oldrev', after: 'newrev', ref: 'ref'} + @data = { before: 'oldrev', after: 'newrev', ref: 'ref' } WebMock.stub_request(:post, @project_hook.url) end @@ -55,7 +55,7 @@ describe ProjectHook do it "POSTs to the web hook URL" do @project_hook.execute(@data, 'push_hooks') expect(WebMock).to have_requested(:post, @project_hook.url).with( - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook' } ).once end @@ -64,7 +64,7 @@ describe ProjectHook do @project_hook.execute(@data, 'push_hooks') expect(WebMock).to have_requested(:post, @project_hook.url).with( - headers: {'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook'} + headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook' } ).once end diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb index e88615e1a2e..8e2fcca2657 100644 --- a/spec/models/project_services/hipchat_service_spec.rb +++ b/spec/models/project_services/hipchat_service_spec.rb @@ -241,17 +241,17 @@ describe HipchatService do context "#message_options" do it "should be set to the defaults" do - expect(hipchat.send(:message_options)).to eq({notify: false, color: 'yellow'}) + expect(hipchat.send(:message_options)).to eq({ notify: false, color: 'yellow' }) end it "should set notfiy to true" do hipchat.stub(notify: '1') - expect(hipchat.send(:message_options)).to eq({notify: true, color: 'yellow'}) + expect(hipchat.send(:message_options)).to eq({ notify: true, color: 'yellow' }) end it "should set the color" do hipchat.stub(color: 'red') - expect(hipchat.send(:message_options)).to eq({notify: false, color: 'red'}) + expect(hipchat.send(:message_options)).to eq({ notify: false, color: 'red' }) end end end diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index 2acdb7dfddc..f785203af7d 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -231,7 +231,7 @@ describe ProjectWiki do end def commit_details - commit = {name: user.name, email: user.email, message: "test commit"} + commit = { name: user.name, email: user.email, message: "test commit" } end def create_page(name, content) diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index d44f094a313..40335990025 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -69,7 +69,7 @@ describe Service do describe "Template" do describe "for pushover service" do let(:service_template) { - PushoverService.create(template: true, properties: {device: 'MyDevice', sound: 'mic', priority: 4, api_key: '123456789'}) + PushoverService.create(template: true, properties: { device: 'MyDevice', sound: 'mic', priority: 4, api_key: '123456789' }) } let(:project) { create(:project) } diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index fceb7668cac..dc84a14bb40 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -43,7 +43,7 @@ describe WikiPage do describe "validations" do before do - subject.attributes = {title: 'title', content: 'content'} + subject.attributes = { title: 'title', content: 'content' } end it "validates presence of title" do @@ -58,7 +58,7 @@ describe WikiPage do end before do - @wiki_attr = {title: "Index", content: "Home Page", format: "markdown"} + @wiki_attr = { title: "Index", content: "Home Page", format: "markdown" } end describe "#create" do @@ -82,7 +82,7 @@ describe WikiPage do let(:title) { 'Index v1.2.3' } before do - @wiki_attr = {title: title, content: "Home Page", format: "markdown"} + @wiki_attr = { title: title, content: "Home Page", format: "markdown" } end describe "#create" do @@ -196,7 +196,7 @@ describe WikiPage do end def commit_details - commit = {name: user.name, email: user.email, message: "test commit"} + commit = { name: user.name, email: user.email, message: "test commit" } end def create_page(name, content) |