Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix specs around statuses and twitter settings
  • Loading branch information
Yannick Francois committed Aug 23, 2013
1 parent 75ad1ab commit c80a708
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 19 deletions.
10 changes: 5 additions & 5 deletions app/models/blog.rb
Expand Up @@ -95,21 +95,21 @@ class Blog < ActiveRecord::Base
setting :author_desc_template, :string, "%author% | %blog_name% | %blog_subtitle%"
setting :archives_title_template, :string, "Archives for %blog_name% %date% %page%"
setting :archives_desc_template, :string, "Archives for %blog_name% %date% %page% %blog_subtitle%"
setting :search_title_template, :string, "Results for %search% | %blog_name% %page%"
setting :search_title_template, :string, "Results for %search% | %blog_name% %page%"
setting :search_desc_template, :string, "Results for %search% | %blog_name% | %blog_subtitle% %page%"
setting :statuses_title_template, :string, "Statuses | %blog_name% %page%"
setting :statuses_desc_template, :string, "Statuses | %blog_name% | %blog_subtitle% %page%"
setting :status_title_template, :string, "%body% | %blog_name%"
setting :status_desc_template, :string, "%excerpt%"

setting :custom_tracking_field, :string, ''
# setting :meta_author_template, :string, "%blog_name% | %nickname%"

setting :twitter_consumer_key, :string, ''
setting :twitter_consumer_secret, :string, ''
setting :custom_url_shortener, :string, ''
setting :statuses_in_timeline, :boolean, ''
setting :statuses_in_timeline, :boolean, true

validate :permalink_has_identifier

def initialize(*args)
Expand Down Expand Up @@ -242,7 +242,7 @@ def urls_to_ping_for(article)
end
urls_to_ping
end

def has_twitter_configured?
return false if self.twitter_consumer_key.nil? or self.twitter_consumer_secret.nil?
return false if self.twitter_consumer_key.empty? or self.twitter_consumer_secret.empty?
Expand Down
4 changes: 1 addition & 3 deletions app/models/user.rb
Expand Up @@ -204,9 +204,7 @@ def generate_password!
end

def has_twitter_configured?
return false if self.twitter_oauth_token.nil? or self.twitter_oauth_token.empty?
return false if self.twitter_oauth_token_secret.nil? or self.twitter_oauth_token_secret.empty?
true
self.twitter_oauth_token.present? && self.twitter_oauth_token_secret.present?
end

protected
Expand Down
21 changes: 10 additions & 11 deletions spec/models/user_spec.rb
Expand Up @@ -2,7 +2,6 @@

describe User do
describe 'FactoryGirl Girl' do

it 'should user factory valid' do
FactoryGirl.create(:user).should be_valid
FactoryGirl.build(:user).should be_valid
Expand Down Expand Up @@ -327,43 +326,43 @@ def set_password(newpass)
it { expect(user.display_names).to eq([user.login, user.firstname, user.lastname, "#{user.firstname} #{user.lastname}"]) }
end
end
describe "User's Twitter configuration" do

describe "User's Twitter configuration" do
it "A user without twitter_oauth_token or twitter_oauth_token_secret should not have Twitter configured" do
user = FactoryGirl.build(:user)
user.has_twitter_configured?.should == false
end

it "A user with an empty twitter_oauth_token and no twitter_oauth_token_secret should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "")
user = FactoryGirl.build(:user, twitter_oauth_token: "", twitter_oauth_token_secret: nil)
user.has_twitter_configured?.should == false
end

it "A user with an empty twitter_oauth_token and an empty twitter_oauth_token_secret should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "", twitter_oauth_token_secret: "")
user.has_twitter_configured?.should == false
end

it "A user with a twitter_oauth_token and no twitter_oauth_token_secret should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "12345")
user = FactoryGirl.build(:user, twitter_oauth_token: "12345", twitter_oauth_token_secret: '')
user.has_twitter_configured?.should == false
end

it "A user with a twitter_oauth_token and an empty twitter_oauth_token_secret should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "12345", twitter_oauth_token_secret: "")
user.has_twitter_configured?.should == false
end

it "A user with a twitter_oauth_token_secret and no twitter_oauth_token should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "", twitter_oauth_token_secret: "67890")
user.has_twitter_configured?.should == false
end

it "A user with a twitter_oauth_token_secret and an empty twitter_oauth_token should not have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token_secret: "67890", twitter_oauth_token: "")
user.has_twitter_configured?.should == false
end

it "A user with a twitter_oauth_token and a twitter_oauth_token_secret should have Twitter configured" do
user = FactoryGirl.build(:user, twitter_oauth_token: "12345", twitter_oauth_token_secret: "67890")
user.has_twitter_configured?.should == true
Expand Down

0 comments on commit c80a708

Please sign in to comment.