- <%= number_with_delimiter(@node.totalcount) %> <%= t('wiki.show.views') %> |
+ <%= number_with_delimiter(@node.totalviews) %> <%= t('wiki.show.views') %> |
<%= raw t('wiki.show.last_edited', :url1 => "/profile/"+@node.latest.author.name, :author => @node.latest.author.name, :time => time_ago_in_words(@node.latest.created_at)) %>
| <%= t('wiki.show.shortlink') %>
diff --git a/db/migrate/20170111153001_node_pageviews.rb b/db/migrate/20170111153001_node_pageviews.rb
new file mode 100644
index 0000000000..dea49902a5
--- /dev/null
+++ b/db/migrate/20170111153001_node_pageviews.rb
@@ -0,0 +1,17 @@
+class NodePageviews < ActiveRecord::Migration
+ def up
+ add_column :node, :legacy_views, :integer, default: 0
+ add_column :node, :views, :integer, default: 0
+ DrupalNodeCounter.all.each do |counter|
+ n = DrupalNode.find_by_nid(counter.nid)
+ n.update_attribute('views', counter.totalcount) if n
+ end
+ # later we'll need to: drop_table :node_counter
+ end
+
+ def down
+ # we don't backwards-migrate totalcount from views
+ remove_column :node, :legacy_views
+ remove_column :node, :views
+ end
+end
diff --git a/db/schema.rb.example b/db/schema.rb.example
index 4480d4bc79..3164a25b1d 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20161230142222) do
+ActiveRecord::Schema.define(:version => 20170111153001) do
create_table "answer_selections", :force => true do |t|
t.integer "user_id"
@@ -231,6 +231,8 @@ ActiveRecord::Schema.define(:version => 20161230142222) do
t.string "path"
t.integer "main_image_id"
t.string "slug"
+ t.integer "legacy_views", :default => 0
+ t.integer "views", :default => 0
end
add_index "node", ["changed"], :name => "node_changed"
diff --git a/test/fixtures/node_counter.yml b/test/fixtures/node_counter.yml
deleted file mode 100644
index de4720f206..0000000000
--- a/test/fixtures/node_counter.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-one:
- nid: 1
-
-two:
- nid: 2
-
-three:
- nid: 3
-
-four:
- nid: 4
-
-five:
- nid: 5
-
-six:
- nid: 6
-
-seven:
- nid: 7
-
-eight:
- nid: 8
-
-nine:
- nid: 9
-
-ten:
- nid: 10
-
-eleven:
- nid: 11
-
-twelve:
- nid: 12
-
-thirteen:
- nid: 13
-
-fourteen:
- nid: 14
-
-fifteen:
- nid: 15
-
-sixteen:
- nid: 16
-
-seventeen:
- nid: 17
-
-eighteen:
- nid: 18
-
-nineteen:
- nid: 19
-
-twenty:
- nid: 20
diff --git a/test/functional/features_controller_test.rb b/test/functional/features_controller_test.rb
index cc77f96d5d..7a95c15132 100644
--- a/test/functional/features_controller_test.rb
+++ b/test/functional/features_controller_test.rb
@@ -10,9 +10,14 @@
class FeaturesControllerTest < ActionController::TestCase
def setup
+ Timecop.freeze # account for timestamp change
activate_authlogic
end
+ def teardown
+ Timecop.return
+ end
+
test "cannot see /features if not logged in" do
get :index
diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 64ce8cede2..0192db1288 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -48,6 +48,7 @@ def teardown
end
test "show note" do
+
note = node(:blog)
note.add_tag('activity:nonexistent', note.author) # testing responses display
assert_equal 'nonexistent', note.power_tag('activity')
@@ -61,6 +62,48 @@ def teardown
assert_select "#other-activities", false
end
+ test "notes record views with unique ips" do
+ note = node(:blog)
+ # clear impressions so we get a unique view
+ Impression.delete_all
+ assert_equal 0, note.views
+ assert_equal 0, Impression.count
+
+ # this assertion didn't work due to a bug in:
+ # https://github.com/publiclab/plots2/issues/1196
+ # assert_difference 'note.views', 1 do
+ assert_difference 'Impression.count', 1 do
+
+ get :show,
+ author: note.author.name,
+ date: Time.at(note.created).strftime("%m-%d-%Y"),
+ id: note.title.parameterize
+
+ end
+
+ assert_equal '0.0.0.0', Impression.last.ip_address
+ Impression.last.update_attribute('ip_address', '0.0.0.1')
+
+ assert_difference 'note.totalviews', 1 do
+ get :show,
+ author: note.author.name,
+ date: Time.at(note.created).strftime("%m-%d-%Y"),
+ id: note.title.parameterize
+ end
+
+ assert_equal 2, note.totalviews
+
+ # same IP won't add to views twice
+ assert_difference 'note.totalviews', 0 do
+
+ get :show,
+ author: note.author.name,
+ date: Time.at(note.created).strftime("%m-%d-%Y"),
+ id: note.title.parameterize
+
+ end
+ end
+
test "redirect normal user to tagged blog page" do
note = node(:one)
blog = node(:blog)
diff --git a/test/functional/tag_controller_test.rb b/test/functional/tag_controller_test.rb
index 5d82fef5f8..039d621611 100644
--- a/test/functional/tag_controller_test.rb
+++ b/test/functional/tag_controller_test.rb
@@ -311,14 +311,28 @@ def setup
assert_equal 'spectrometry', tag.parent
assert_equal '', tag2.parent
node(:blog).add_tag('spectrometry', rusers(:bob))
+ assert node(:blog).has_tag_without_aliasing('spectrometry')
get :show, id: 'spectrometry'
- assert_equal 2, assigns(:notes).length
- assert assigns(:notes).first.has_tag_without_aliasing('spectrometer')
- assert_false assigns(:notes).first.has_tag_without_aliasing('spectrometry')
- assert_false assigns(:notes).last.has_tag_without_aliasing('spectrometer')
- assert assigns(:notes).last.has_tag_without_aliasing('spectrometry')
+ # order of timestamps during testing (almost same timestamps) was causing testing irregularities
+ notes = assigns(:notes).sort_by { |a| a.title }.reverse
+
+ assert_equal 2, notes.length
+ assert_equal [1,13], notes.collect(&:nid)
+ assert_equal [node(:one).title, "Blog post"], notes.collect(&:title)
+
+ # should be the first node, nid=1
+ assert_equal node(:one).title, notes.first.title
+ assert_equal ["spectrometer"], notes.first.tags.collect(&:name)
+ assert notes.first.has_tag_without_aliasing('spectrometer')
+ assert_false notes.first.has_tag_without_aliasing('spectrometry')
+
+ # should be the blog node, nid=13
+ assert_equal "Blog post", notes.last.title
+ assert_equal ["spectrometry"], notes.last.tags.collect(&:name)
+ assert_false notes.last.has_tag_without_aliasing('spectrometer')
+ assert notes.last.has_tag_without_aliasing('spectrometry')
end
test "does not show things tagged with parent tag" do
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 0a9bbdb6f5..f7503e4ee0 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -59,10 +59,18 @@ def teardown
assert_response :success
end
- test "should get wiki page" do
- get :show, id: node(:about).id
+ test "should get wiki page and record unique views" do
+ Impression.delete_all # clear uniques
+ assert_equal 0, node(:about).views
+ assert_equal 0, Impression.count
- assert_response :success
+ assert_difference 'Impression.count', 1 do
+
+ get :show, id: node(:about).slug
+
+ assert_response :success
+
+ end
end
test "should get root-level (/about) wiki page" do
diff --git a/test/integration/node_unique_views_test.rb b/test/integration/node_unique_views_test.rb
new file mode 100644
index 0000000000..411c30cf5d
--- /dev/null
+++ b/test/integration/node_unique_views_test.rb
@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class NodeInsertExtrasTest < ActionDispatch::IntegrationTest
+
+ test "should get wiki page and record unique views" do
+ Impression.delete_all # clear uniques
+ assert_equal 0, node(:about).views
+ assert_equal 0, Impression.count
+
+ assert_difference 'Impression.count', 1 do
+
+ get "wiki/#{node(:about).slug}"
+
+ assert_response :success
+
+ end
+
+ assert_difference 'node(:about).totalviews', 0 do
+ assert_difference 'Impression.count', 0 do
+
+ get "wiki/#{node(:about).slug}"
+ assert_response :success
+
+ end
+ end
+
+ assert_equal '127.0.0.1', Impression.last.ip_address
+ assert Impression.last.update_attributes(ip_address: '0.0.0.0')
+
+ assert_difference 'node(:about).totalviews', 1 do
+ assert_difference 'Impression.count', 1 do
+
+ get "wiki/#{node(:about).slug}"
+ assert_response :success
+
+ end
+ end
+ end
+
+end