consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,675 Commits 1 Branch 0 Tags
087c8b0a99619e59df97fd27f1b51e7dea742733
Commit Graph

178 Commits

Author SHA1 Message Date
kikito
43bdfb940e merges master and fixes conflicts 2015-09-10 17:47:40 +02:00
kikito
2d3015703d replaces constants by class methods + private functions. Fixes broken tests 2015-09-10 13:02:21 +02:00
rgarcia
88579de5dd fixes specs 2015-09-09 22:55:39 +02:00
rgarcia
339e978237 default order confidence_score for home and debate index 2015-09-08 14:47:58 +02:00
rgarcia
f11220206a displays alert for conflictive debates 2015-09-07 17:17:33 +02:00
Juanjo Bazán
ad9e6729a1 fixes spec 2015-09-06 22:22:43 +02:00
Juanjo Bazán
1a7806150a adds pending filter to admin/debates 2015-09-06 21:42:22 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
kikito
55c48e3719 Fixes randomly-failing travis specs 
The problem was that after changing page with the selects, capybara
needs to “find something which has changed on the page” in order to
“wait”. The “have_selects” did not wait because they did not change
(you change them, then the page changes, and they stay the same)
 2015-09-04 17:44:32 +02:00
kikito
8e451dbf66 adds even more expects to random debate order spec to fix travis 2015-09-04 16:22:07 +02:00
kikito
457b734ca4 adds within clauses to debates specs. This should wait for page refreshes if needed 2015-09-04 15:55:30 +02:00
kikito
b9453a83bb remove failing line (undefined var) 2015-09-04 15:41:12 +02:00
Juanjo Bazán
44bab6f4b4 adds expect to wait for to capybara 2015-09-04 15:15:20 +02:00
Juanjo Bazán
b6e6356172 fixes hot_score spec 2015-09-04 15:00:18 +02:00
Juanjo Bazán
2a4c29c7ca Merge branch 'master' into hot-score-347 2015-09-04 14:59:51 +02:00
Juanjo Bazán
742eed1925 adds check for CKEditor presence 2015-09-04 14:04:46 +02:00
kikito
7c3ca55de1 Adds the default score selector/controller. Refactors debates specs 2015-09-04 11:50:07 +02:00
Juanjo Bazán
559b60e63f adds random order to debates' index 2015-09-03 18:50:19 +02:00
Juanjo Bazán
dbfa35c444 adds 'most commented' order to debates 2015-09-03 18:31:16 +02:00
Juanjo Bazán
cd3806476f removes 'most voted' order from debates 2015-09-03 18:20:12 +02:00
Juanjo Bazán
bcb1f2ba72 adds order by score to debates 2015-09-03 18:13:48 +02:00
Juanjo Bazán
05a647f9e7 Merge pull request #345 from AyuntamientoMadrid/improve_styles 
Improve styles
 2015-09-03 16:43:10 +02:00
Alberto Garcia Cabeza
efeb5a7457 Updates texts and changes test 2015-09-03 14:19:45 +02:00
Raimond Garcia
f640a74e0a Merge pull request #327 from AyuntamientoMadrid/exact-capybara 
Exact capybara
 2015-09-03 12:39:23 +02:00
Juanjo Bazán
572432f2cf Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337 
Remove tag filter
 2015-09-03 11:50:53 +02:00
kikito
002d86884b Removes the tag selector from debate#index view & refactors i18n 2015-09-03 11:15:05 +02:00
Alberto Garcia Cabeza
fca3a4de37 Changes tests for new texts 2015-09-03 00:10:07 +02:00
kikito
e3cbae4f02 Makes capybara exact. Should fix some randomly-failing specs 2015-09-02 18:05:43 +02:00
kikito
27ece220f6 Transform Flag.flag! & unflag! into non-raising methods 
They now return false and do nothing instead
 2015-08-31 19:02:50 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic 
Allow debates to be filtered by topic
 2015-08-28 17:41:38 +02:00
Marko Lovic
c11b611b1a Combine debates topic and order filters 2015-08-28 17:23:36 +02:00
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
Juanjo Bazán
1d997d4929 fixes build, changes i18n ignored keys and specs 
ref: #254
 2015-08-27 18:08:56 +02:00
Marko Lovic
e8004ca1d3 Add to javascript to handle debates order change 2015-08-27 17:18:07 +02:00
Marko Lovic
bfeff8d241 Implement custom rspec matcher appear_before 2015-08-27 15:24:59 +02:00
Marko Lovic
f5622b3425 Assign each test debate to one variable 2015-08-27 15:24:59 +02:00
Marko Lovic
6f32801a88 Change names of debate order filters 
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
 2015-08-27 15:24:59 +02:00
Marko Lovic
2d48966de3 Change variable name and references from "filter" to "order" 2015-08-27 15:24:59 +02:00
Marko Lovic
ccaca54816 Add filters to specify order of debates#index 2015-08-27 15:24:59 +02:00
kikito
909dfb4ce3 Several renamings 
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
 2015-08-27 10:48:49 +02:00
kikito
015fe704e4 Fixes flagging specs by making them id-based instead of text-based 2015-08-26 13:14:42 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +02:00
Alberto Garcia Cabeza
0d54cca910 Changes test for pagination 2015-08-20 12:55:31 +02:00
Juanjo Bazán
947514fbfc adds pagination to debates#index 
Ref: #80
 2015-08-19 16:30:25 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Juanjo Bazán
7cc7efb2c7 uses timezone aware method instead of Date 2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418 adds spec 
checks failed debate create/update and inclusion of featured tags
 2015-08-16 00:01:30 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +02:00