8000 Merge pull request #5883 from activeadmin/fix_ci · activeadmin/activeadmin@6a85aaf · GitHub
[go: up one dir, main page]

Skip to content

Commit 6a85aaf

Browse files
authored
Merge pull request #5883 from activeadmin/fix_ci
Fix bug report template
2 parents 241dd5c + 018e36f commit 6a85aaf

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/tmp
2+
/tasks/tmp
23
/coverage
34
/.yardoc
45
/.ruby-version

tasks/bug_report_template.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
end
1212

1313
# Change Rails version if necessary.
14-
gem 'rails', '5.2.1.1'
14+
gem 'rails', '6.0.0'
1515

16-
gem 'sassc-rails', '2.1.1'
17-
gem 'sqlite3', '1.3.13', platform: :mri
16+
gem 'sprockets', '3.7.2'
17+
gem 'sassc-rails', '2.1.2'
18+
gem 'sqlite3', '1.4.1', platform: :mri
1819
gem 'activerecord-jdbcsqlite3-adapter', "52.0", platform: :jruby
1920
gem 'jruby-openssl', '0.10.1', platform: :jruby
2021
end
@@ -45,7 +46,8 @@ class TestApp < Rails::Application
4546

4647
config.eager_load = false
4748
config.logger = Logger.new($stdout)
48-
Rails.logger = config.logger
49+
50+
config.hosts = "www.example.com"
4951
end
5052

5153
class ApplicationController < ActionController::Base
@@ -86,16 +88,16 @@ class BugTest < ActionDispatch::IntegrationTest
8688

8789
def test_admin_root_success?
8890
get admin_root_url
89-
assert_response :success
9091
assert_match 'Test Me', response.body # has content
9192
assert_match 'Users', response.body # has 'Your Models' in menu
93+
assert_response :success
9294
end
9395

9496
def test_admin_users
9597
User.create! full_name: 'John Doe'
9698
get admin_users_url
97-
assert_response :success
9899
assert_match 'John Doe', response.body # has created row
100+
assert_response :success
99101
end
100102

101103
private

0 commit comments

Comments
 (0)
0