fix some rubocop warnings

the last one will be fixed with the next rubocop release
This commit is contained in:
Benjamin Neff 2015-09-21 00:50:09 +02:00
parent 1ee03a1e66
commit eabe1135ee
7 changed files with 10 additions and 12 deletions

View file

@ -32,8 +32,8 @@ end
group :test do
# rspec formatter
gem "fuubar", "2.0.0", require: false
gem "nyan-cat-formatter", require: false
gem "fuubar", "2.0.0", require: false
gem "nyan-cat-formatter", require: false
# test coverage
gem "simplecov", "0.10.0", require: false

View file

@ -14,8 +14,8 @@ Gem::Specification.new do |s|
s.description = "A rails engine that adds the diaspora* federation protocol to a rails app"
s.license = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
s.files = Dir["app/**/*", "config/routes.rb", "lib/diaspora_federation/{engine,rails}.rb",
"LICENSE", "README.md"]
s.files = Dir["app/**/*", "config/routes.rb", "lib/diaspora_federation/{engine,rails}.rb",
"LICENSE", "README.md"]
s.required_ruby_version = "~> 2.0"

View file

@ -16,7 +16,7 @@ Gem::Specification.new do |s|
"among the various installations of Diaspora*"
s.license = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
s.files = Dir["lib/**/*", "LICENSE", "README.md"] - Dir["lib/diaspora_federation/{engine,rails}.rb"]
s.files = Dir["lib/**/*", "LICENSE", "README.md"] - Dir["lib/diaspora_federation/{engine,rails}.rb"]
s.required_ruby_version = "~> 2.0"

View file

@ -152,7 +152,7 @@ module DiasporaFederation
links = data[:links]
# TODO: remove! public key is deprecated in webfinger
public_key = parse_link(links, REL_PUBKEY)
public_key = parse_link(links, REL_PUBKEY)
new(
acct_uri: data[:subject],

View file

@ -13,9 +13,7 @@ FactoryGirl.define do
diaspora_id
url "http://localhost:3000/"
serialized_public_key { generate(:public_key) }
after(:create) do |u|
u.save
end
after(:create, &:save)
end
factory :webfinger, class: DiasporaFederation::Discovery::WebFinger do

View file

@ -26,7 +26,7 @@ module DiasporaFederation
%i(hcard_url profile_url atom_url).each do |prop|
describe "##{prop}" do
it_behaves_like "a url validator without path" do
it_behaves_like "a url validator without path" do
let(:property) { prop }
end

View file

@ -7,9 +7,9 @@ class Person < ActiveRecord::Base
def atom_url; "#{url}public/#{nickname}.atom" end
def salmon_url; "#{url}receive/users/#{guid}" end
def nickname; diaspora_id.split("@")[0] end
def nickname; diaspora_id.split("@")[0] end
def photo_default_url; "#{url}assets/user/default.png" end
def photo_default_url; "#{url}assets/user/default.png" end
def searchable; true end
def full_name; "Dummy User" end