diff --git a/.travis.yml b/.travis.yml index 61e02f3c..3f98925d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby -rvm: 2.0.0 +rvm: 2.1 before_script: - cp config/database.yml.postgres config/database.yml - cp config/justask.yml.example config/justask.yml - bundle exec rake db:setup - - bundle exec rake db:migrate + - bundle exec rake db:migrate \ No newline at end of file diff --git a/config/justask.yml.example b/config/justask.yml.example index f7669a9a..725b5c16 100644 --- a/config/justask.yml.example +++ b/config/justask.yml.example @@ -15,14 +15,14 @@ items_per_page: 10 # OAuth tokens sharing: twitter: - enabled: false + enabled: true # Get the tokens from https://apps.twitter.com consumer_key: '' consumer_secret: '' facebook: enabled: false tumblr: - enabled: false + enabled: true # Get the tokens from https://www.tumblr.com/oauth/apps consumer_key: '' consumer_secret: '' diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb index 7af88527..84844425 100644 --- a/spec/features/users/inbox_spec.rb +++ b/spec/features/users/inbox_spec.rb @@ -25,22 +25,21 @@ feature "Inbox", :devise do login_as me, scope: :user visit root_path expect(page).to have_text('1 new question'.upcase) - page.driver.render Rails.root.join("tmp/answer_#{Time.now.to_i}_1.png"), full: true + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true click_link "Inbox" expect(page).to have_text(question.content) - expect(page).to have_field('ib-answer', wait: 2) - fill_in "ib-answer", with: "This is an answer. I'm number i!" - page.driver.render Rails.root.join("tmp/answer_#{Time.now.to_i}_2.png"), full: true + fill_in "ib-answer", with: Faker::Lorem.sentence + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true click_button "Answer" wait_for_ajax - expect(page).not_to have_text(question.content, wait: 2) - page.driver.render Rails.root.join("tmp/answer_#{Time.now.to_i}_3.png"), full: true + expect(page).not_to have_text(question.content) + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_3.png"), full: true visit show_user_profile_path(me.screen_name) expect(page).to have_text(question.content) - page.driver.render Rails.root.join("tmp/answer_#{Time.now.to_i}_4.png"), full: true + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_4.png"), full: true end # Scenario: User generates new question