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.

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

Update to jasmine-2.3.4 #38

Merged
merged 3 commits into from
Aug 29, 2020
Merged

Update to jasmine-2.3.4 #38

merged 3 commits into from
Aug 29, 2020

Conversation

andyholmes
Copy link
Contributor

This is the latest patch release from the 2.3.4 series

@andyholmes
Copy link
Contributor Author

This was my first go (before bed 😉). Below is the reject patch snippets, I'm not sure why those were there so advice would be welcome.

meson test failed, but it seems to be because of errant output on stdout/stderr because all tests actually pass with ok.

--- jasmine.js	2017-02-07 17:19:05.530588235 -0800
+++ jasmine.js	2017-02-07 17:06:36.825849025 -0800
@@ -689,12 +696,6 @@
 
       runnableLookupTable[suite.id] = suite;
       return suite;
-
-      function suiteStarted(suite) {
-        currentlyExecutingSuites.push(suite);
-        defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
-        reporter.suiteStarted(suite.result);
-      }
     };
 
     this.describe = function(description, specDefinitions) {
@@ -1106,8 +1107,6 @@
       }
     };
 
-    return self;
-
     function legacyIE() {
       //if these methods are polyfilled, apply will be present
       return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
@@ -3055,5 +3058,5 @@
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.2.0';
+  return '2.2.1';
 };

@ptomato
Copy link
Owner

ptomato commented Aug 26, 2020

I've made the 2.3.0 release and updated the release checklist so it's actually correct now, so have at it!

@andyholmes andyholmes force-pushed the jasmine-2-3-4 branch 2 times, most recently from d16ac57 to ff7dc47 Compare August 26, 2020 07:51
This is the latest patch release from the 2.3.x series
@andyholmes andyholmes changed the title WIP: Update to jasmine-2.3.4 Update to jasmine-2.3.4 Aug 26, 2020
@andyholmes andyholmes changed the title Update to jasmine-2.3.4 WIP: Update to jasmine-2.3.4 Aug 26, 2020
@andyholmes andyholmes changed the title WIP: Update to jasmine-2.3.4 Update to jasmine-2.3.4 Aug 27, 2020
Copy link
Owner

@ptomato ptomato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ptomato ptomato merged commit 4da7295 into ptomato:master Aug 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants