nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2017-05-03 02:09:07 +02:00
commit 7f784cf2b1
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
7 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -183,8 +183,8 @@ gem "typhoeus", "1.1.2"
gem "gon", "6.1.0" gem "gon", "6.1.0"
gem "hamlit", "2.8.0" gem "hamlit", "2.8.0"
gem "mobile-fu", "1.3.1" gem "mobile-fu", "1.3.1"
gem "rails-timeago", "2.16.0"
gem "will_paginate", "3.1.5" gem "will_paginate", "3.1.5"
gem "rails-timeago", "2.11.0"
# Logging # Logging

6
Gemfile.lock
View file

@ -568,7 +568,7 @@ GEM
rails-i18n (4.0.8) rails-i18n (4.0.8)
i18n (~> 0.7) i18n (~> 0.7)
railties (~> 4.0) railties (~> 4.0)
rails-timeago (2.11.0) rails-timeago (2.16.0)
actionpack (>= 3.1) actionpack (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
rails_admin (0.8.1) rails_admin (0.8.1)
@ -734,7 +734,7 @@ GEM
unf (~> 0.1.0) unf (~> 0.1.0)
typhoeus (1.1.2) typhoeus (1.1.2)
ethon (>= 0.9.0) ethon (>= 0.9.0)
tzinfo (1.2.2) tzinfo (1.2.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.1.2) uglifier (3.1.2)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
@ -886,7 +886,7 @@ DEPENDENCIES
rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.16)! rails-assets-perfect-scrollbar (= 0.6.16)!
rails-i18n (= 4.0.8) rails-i18n (= 4.0.8)
rails-timeago (= 2.11.0) rails-timeago (= 2.16.0)
rails_admin (= 0.8.1) rails_admin (= 0.8.1)
rb-fsevent (= 0.9.8) rb-fsevent (= 0.9.8)
rb-inotify (= 0.9.8) rb-inotify (= 0.9.8)

2
app/assets/javascripts/main.js
View file

@ -9,7 +9,7 @@
//= require autosize //= require autosize
//= require charcount //= require charcount
//= require jquery-placeholder //= require jquery-placeholder
//= require rails-timeago //= require jquery.timeago
//= require jquery-ui/core //= require jquery-ui/core
//= require jquery-ui/widget //= require jquery-ui/widget
//= require jquery-ui/mouse //= require jquery-ui/mouse

2
app/assets/javascripts/mobile/mobile.js
View file

@ -11,7 +11,7 @@
//= require keycodes //= require keycodes
//= require jquery.autoSuggest.custom //= require jquery.autoSuggest.custom
//= require fine-uploader/fine-uploader.core //= require fine-uploader/fine-uploader.core
//= require rails-timeago //= require jquery.timeago
//= require underscore //= require underscore
//= require bootstrap //= require bootstrap
//= require diaspora //= require diaspora

6
app/assets/javascripts/widgets/timeago.js
View file

@ -26,6 +26,12 @@
} }
}); });
} }
$.timeago.settings.autoDispose = false;
$(function() {
$("time[data-time-ago]").timeago();
});
}); });
}; };
})(); })();

2
features/mobile/activity_stream.feature
View file

@ -1,5 +1,5 @@
@javascript @mobile @javascript @mobile
Feature: Viewing my activity on the steam mobile page Feature: Viewing my activity on the stream mobile page
In order to navigate Diaspora* In order to navigate Diaspora*
As a mobile user As a mobile user
I want to view my activity stream I want to view my activity stream

16
features/mobile/stream.feature Normal file
View file

@ -0,0 +1,16 @@
@javascript @mobile
Feature: Viewing the main stream mobile page
Background:
Given following users exist:
| username |
| alice |
| bob |
And a user with username "bob" is connected with "alice"
And "alice@alice.alice" has a public post with text "Hello! I am #newhere"
Scenario: Show post with correct timestamp
When I sign in as "bob@bob.bob" on the mobile website
And I go to the stream page
Then I should see "Hello! I am #newhere" within ".ltr"
And I should see "less than a minute ago" within "#main_stream"