File tree 3 files changed +28
-2
lines changed
main/java/com/saucelabs/saucebindings
test/java/com/saucelabs/saucebindings/options
3 files changed +28
-2
lines changed Original file line number Diff line number Diff line change
1
+ package com .saucelabs .saucebindings ;
2
+
3
+ import java .io .BufferedReader ;
4
+ import java .io .IOException ;
5
+ import java .io .InputStreamReader ;
6
+
7
+ public class GitManager {
8
+ private static String currentBranch = "_default_" ;
9
+
10
+ public static String getCurrentBranch () {
11
+ try {
12
+ Process process = Runtime .getRuntime ().exec ("git rev-parse --abbrev-ref HEAD" );
13
+ process .waitFor ();
14
+ BufferedReader reader = new BufferedReader (new InputStreamReader (process .getInputStream ()));
15
+ String line = reader .readLine ();
16
+ if (!line .contains ("fatal:" )) {
17
+ currentBranch = line ;
18
+ }
19
+ } catch (IOException | InterruptedException e ) {
20
+ // Ignore exception and use default
21
+ }
22
+ return currentBranch ;
23
+ }
24
+ }
Original file line number Diff line number Diff line change 1
1
package com .saucelabs .saucebindings .options ;
2
2
3
3
import com .saucelabs .saucebindings .CITools ;
4
+ import com .saucelabs .saucebindings .GitManager ;
4
5
import com .saucelabs .saucebindings .SauceSession ;
5
6
import com .saucelabs .saucebindings .SystemManager ;
6
7
import lombok .AccessLevel ;
@@ -73,7 +74,7 @@ public MutableCapabilities toCapabilities() {
73
74
}
74
75
75
76
if (branch == null ) {
76
- branch = "_default_" ;
77
+ branch = GitManager . getCurrentBranch () ;
77
78
}
78
79
79
80
capabilityManager .addCapabilities ();
Original file line number Diff line number Diff line change 2
2
3
3
import com .saucelabs .saucebindings .Browser ;
4
4
import com .saucelabs .saucebindings .CITools ;
5
+ import com .saucelabs .saucebindings .GitManager ;
5
6
import com .saucelabs .saucebindings .SaucePlatform ;
6
7
import com .saucelabs .saucebindings .SystemManager ;
7
8
import org .junit .Test ;
@@ -21,7 +22,7 @@ public void createsDefaultVisualOptions() {
21
22
22
23
MutableCapabilities visualCapabilities = new MutableCapabilities ();
23
24
visualCapabilities .setCapability ("apiKey" , System .getenv ("SCREENER_API_KEY" ));
24
- visualCapabilities .setCapability ("branch" , "_default_" );
25
+ visualCapabilities .setCapability ("branch" , GitManager . getCurrentBranch () );
25
26
visualCapabilities .setCapability ("projectName" , CITools .getBuildName ());
26
27
27
28
assertEquals (visualCapabilities , visualOptions .toCapabilities ().getCapability ("sauce:visual" ));
You can’t perform that action at this time.
0 commit comments