Download as
Browse Code »

Commit df51a028c8f75152f21f4a3bb46f666ac3566e4d

Authored by Braulio Bhavamitra
1 parent 69d5f48c
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

rails4: set current user on approve_article tests

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
test/functional/application_controller_test.rb
  Diff comments   View file @df51a02
@@ -194,7 +194,6 @@ class ApplicationControllerTest < ActionController::TestCase @@ -194,7 +194,6 @@ class ApplicationControllerTest < ActionController::TestCase
194 User.expects(:current=).with do |user| 194 User.expects(:current=).with do |user|
195 user == testuser 195 user == testuser
196 end.at_least_once 196 end.at_least_once
197 - User.expects(:current=).with(nil).at_least_once if RUBY_VERSION >= '2.0'  
198 get :index 197 get :index
199 end 198 end
200 199
test/unit/approve_article_test.rb
  Diff comments   View file @df51a02
@@ -6,7 +6,8 @@ class ApproveArticleTest < ActiveSupport::TestCase @@ -6,7 +6,8 @@ class ApproveArticleTest < ActiveSupport::TestCase
6 ActionMailer::Base.delivery_method = :test 6 ActionMailer::Base.delivery_method = :test
7 ActionMailer::Base.perform_deliveries = true 7 ActionMailer::Base.perform_deliveries = true
8 ActionMailer::Base.deliveries = [] 8 ActionMailer::Base.deliveries = []
9 - @profile = create_user('test_user').person 9 + User.current = @user = create_user 'test_user'
  10 + @profile = @user.person
10 @article = fast_create(TextileArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article') 11 @article = fast_create(TextileArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article')
11 @community = fast_create(Community) 12 @community = fast_create(Community)
12 @community.add_member(@profile) 13 @community.add_member(@profile)