Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced http links with https in test/functional/notes_controller_test.rb #9261

Merged
merged 2 commits into from
Mar 8, 2021
+4 −4
Merged

Replaced http links with https in test/functional/notes_controller_test.rb #9261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b06ea
Replaced http links with https
lagunasmel Mar 3, 2021
735cf6e
Merge branch 'main' of https://github.com/publiclab/plots2 into repla…
lagunasmel Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/functional/notes_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ def teardown
node = Node.where(type: 'note', status: 1).first
assert node.comments.length > 0
comment = node.comments.last(2).first
comment.comment = 'Test **markdown** and http://links.com'
comment.comment = 'Test **markdown** and https://links.com'
comment.save!

get :show, params: { id: node.id }

assert_select 'strong', 'markdown'
assert_select 'a', 'http://links.com'
assert_select 'a', 'https://links.com'

assert_response :success
end
Expand Down Expand Up @@ -483,13 +483,13 @@ def teardown
comment = Comment.new(nid: nodes(:one).nid,
uid: users(:bob).id,
thread: '01/')
comment.comment = '<iframe src="http://mapknitter.org/embed/sattelite-imagery" style="border:0;"></iframe>'
comment.comment = '<iframe src="https://mapknitter.org/embed/sattelite-imagery" style="border:0;"></iframe>'
comment.save
node = nodes(:one).path.split('/')

get :show, params: { id: node[4], author: node[2], date: node[3] }

assert_select 'iframe[src=?]', 'http://mapknitter.org/embed/sattelite-imagery'
assert_select 'iframe[src=?]', 'https://mapknitter.org/embed/sattelite-imagery'
end

# test "should mark admins and moderators with a special icon" do
Expand Down