From fa28b941ce2e417ca71e6f1f2890781537273d5f Mon Sep 17 00:00:00 2001
From: Kip Gebhardt
Date: Mon, 20 Feb 2017 15:23:07 -0800
Subject: [PATCH] Updating dependencies and fixing tests for node-rss 1.2.0
output format
---
package.json | 2 +-
test/expected_output/dateAscOutput.xml | 17 ++++++++---------
test/expected_output/dateDescOutput.xml | 15 +++++++--------
test/expected_output/emptyFeed.xml | 3 +--
test/expected_output/fileFeedBadPlugin.xml | 3 +--
test/expected_output/fileFeedOutput.xml | 7 +++----
test/expected_output/fileFeedOutputPlugins.xml | 7 +++----
test/index.js | 1 -
8 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/package.json b/package.json
index e1cbd16..f3afd1e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"include-folder": "^1.0.0",
"lodash": "^4.17.4",
"request": "^2.57.0",
- "rss": "git://github.com/rv-kip/node-rss.git#8d1420"
+ "rss": "1.2.0"
},
"devDependencies": {
"mockdate": "^2.0.1",
diff --git a/test/expected_output/dateAscOutput.xml b/test/expected_output/dateAscOutput.xml
index 6304e38..16113c5 100644
--- a/test/expected_output/dateAscOutput.xml
+++ b/test/expected_output/dateAscOutput.xml
@@ -1,15 +1,14 @@
-
-
+
- This feed comes from a file
+
http://github.com/dylang/node-rss
rss-braiderWed, 31 Dec 2014 00:00:01 GMT
- <p>Stepping out of BART at 24th and Mission at most hours of the day, one is likely to hear the pulse of African drums, hip-hop or salsa emanating from the second-floor studios of Dance Brigade's Dance Mission Theater. But that music may not continue forever.</p>
-<p>The performance space and dance school <a href="http://ww2.kqed.org/news/2014/12/20/dance-mission-theater-rent-increase-worries-artists/" target="_self" id="rssmi_more"> ...read more</a>
+ Stepping out of BART at 24th and Mission at most hours of the day, one is likely to hear the pulse of African drums, hip-hop or salsa emanating from the second-floor studios of Dance Brigade's Dance Mission Theater. But that music may not continue forever.
+
The performance space and dance school ...read more]]>
http://ww2.kqed.org/news/2014/12/20/dance-mission-theater-rent-increase-worries-artists/
http://ww2.kqed.org/arts/2014/12/20/rent-hike-for-dance-mission-theater-has-artists-worried-about-uncertain-future/
@@ -27,7 +26,7 @@
- Until February 5, 2015, you can visit the main branch of the San Francisco Public Library and be momentarily transported through space and time to the early days of the Exploratorium via the life and work of Bob Miller, who died in 2007.
+
http://ww2.kqed.org/arts/2014/12/20/bob-miller-teasing-science-lessons-from-everyday-phenomena/
http://ww2.kqed.org/arts/?p=10220517
@@ -55,7 +54,7 @@
- In the dark of winter, San Franciscans with an urge to celebrate the light can visit a new wealth of illuminated art installations. This video tour offers a preview of some of the more dazzling works.
+
http://ww2.kqed.org/arts/2014/12/21/on-darkest-nights-illuminated-art-brings-holiday-glow/
http://ww2.kqed.org/arts/?p=10231062
@@ -72,7 +71,7 @@
- One night back in November, the YBCA took a trip to 1993 to celebrate a groundbreaking year for hip hop.
+
http://ww2.kqed.org/arts/2014/12/22/93-til-infinity-watch-bay-area-musicians-remix-classic-90s-hip-hop/
http://ww2.kqed.org/arts/?p=10230592
@@ -91,7 +90,7 @@
- Hands up, umbrellas out, hoodies on, fists raised -- the icons of protest have long played a significant role in movements of social change and revolution. Some of the most potent protest icons of 2014 appeared in just the last four months of the year.
+
http://ww2.kqed.org/arts/2014/12/23/protest-icons-not-just-for-show/
http://ww2.kqed.org/arts/?p=10189953
diff --git a/test/expected_output/dateDescOutput.xml b/test/expected_output/dateDescOutput.xml
index 22fb1bc..86bb786 100644
--- a/test/expected_output/dateDescOutput.xml
+++ b/test/expected_output/dateDescOutput.xml
@@ -1,14 +1,13 @@
-
-
+
- This feed comes from a file
+
http://github.com/dylang/node-rss
rss-braiderWed, 31 Dec 2014 00:00:01 GMT
- A handful of scenes resonate from a mediocre year for film.
+
http://ww2.kqed.org/arts/2014/12/26/top-10-movie-moments-of-2014/
http://ww2.kqed.org/arts/?p=10222283
@@ -56,7 +55,7 @@
- Cy Musiker and David Wiegand share their picks for great events around the Bay Area this week.
+
http://ww2.kqed.org/arts/2014/12/25/radio-show-rockin-roots-to-radical-rauschenberg/
http://ww2.kqed.org/arts/?p=10238611
@@ -98,7 +97,7 @@
- Above: Ensemble Mik Nawooj (EMN), led by music director, composer/pianist JooWan Kim, reinterprets Wu-Tang Clan’s “C.R.E.A.M.” at YBCA’s Clas/Sick Hip Hop: 1993 Edition. Ensemble Mik Nawooj (EMN) is the brainchild of composer/pianist JooWan Kim, who introduces western-European classical techniques into hip-hop, rock, and pop. The group’s lineup includes traditional Pierrot ensemble instrumentation (flute, clarinet, violin, cello and piano) with […]
+
http://ww2.kqed.org/arts/2014/12/24/a-hip-hop-orchestra-does-wu-tang-clans-c-r-e-a-m/
http://ww2.kqed.org/arts/?p=10238600
@@ -118,7 +117,7 @@
- Above: Kev Choice Ensemble reinterprets Saafir’s “Light Sleeper” at YBCA’s Clas/Sick Hip Hop: 1993 Edition. Oakland-based artist Kev Choice is a pianist, MC, producer, bandleader, sideman, music historian and urban griot dedicated to cultural expression. Through his band Kev Choice Ensemble, he produces and performs his own material, including original jazz and classical compositions as well as classical, […]
+
http://ww2.kqed.org/arts/2014/12/24/a-jazz-hip-hop-funk-big-band-pays-homage-to-saafirs-light-sleeper/
http://ww2.kqed.org/arts/?p=10238610
@@ -139,7 +138,7 @@
- Though the original intent was to make as much art as possible, the project somehow morphed into a goal of producing a seemingly preposterous number of paintings; now the mission of the <em>One Thousand Thousand</em> project is to amass that amount with the help of friends.
+ One Thousand Thousand project is to amass that amount with the help of friends.]]>
http://ww2.kqed.org/arts/2014/12/24/jason-mchenry-and-his-quest-to-amass-one-million-paintings/
http://ww2.kqed.org/arts/?p=10218934
diff --git a/test/expected_output/emptyFeed.xml b/test/expected_output/emptyFeed.xml
index 169bd60..b7d0420 100644
--- a/test/expected_output/emptyFeed.xml
+++ b/test/expected_output/emptyFeed.xml
@@ -1,5 +1,4 @@
-
-
+
diff --git a/test/expected_output/fileFeedBadPlugin.xml b/test/expected_output/fileFeedBadPlugin.xml
index ad5ffb9..e8b9a0f 100644
--- a/test/expected_output/fileFeedBadPlugin.xml
+++ b/test/expected_output/fileFeedBadPlugin.xml
@@ -1,5 +1,4 @@
-
-
+
diff --git a/test/expected_output/fileFeedOutput.xml b/test/expected_output/fileFeedOutput.xml
index 316fe66..5cc7a6e 100644
--- a/test/expected_output/fileFeedOutput.xml
+++ b/test/expected_output/fileFeedOutput.xml
@@ -1,14 +1,13 @@
-
-
+
- This feed comes from a file
+
http://github.com/dylang/node-rss
rss-braiderWed, 31 Dec 2014 00:00:01 GMT
- A handful of scenes resonate from a mediocre year for film.
+
http://ww2.kqed.org/arts/2014/12/26/top-10-movie-moments-of-2014/
http://ww2.kqed.org/arts/?p=10222283
diff --git a/test/expected_output/fileFeedOutputPlugins.xml b/test/expected_output/fileFeedOutputPlugins.xml
index f9c4f54..d8a4587 100644
--- a/test/expected_output/fileFeedOutputPlugins.xml
+++ b/test/expected_output/fileFeedOutputPlugins.xml
@@ -1,14 +1,13 @@
-
-
+
- This feed comes from a file
+
http://github.com/dylang/node-rss
rss-braiderWed, 31 Dec 2014 00:00:01 GMT
- A handful of scenes resonate from a mediocre year for film.
+
http://ww2.kqed.org/arts/2014/12/26/top-10-movie-moments-of-2014/
http://ww2.kqed.org/arts/?p=10222283
diff --git a/test/index.js b/test/index.js
index 21c7ab5..a9a10a0 100644
--- a/test/index.js
+++ b/test/index.js
@@ -23,7 +23,6 @@ test('generate feed. No plugins', function(t) {
}
// console.log(data);
t.equal(data, expectedOutput.fileFeedOutput);
-
});
});